* Added QuadForce 2.0 version detection

This commit is contained in:
Cyan 2013-04-30 17:40:17 +00:00
parent ff4b075fbb
commit 304c0ef5ec
4 changed files with 16 additions and 6 deletions

View File

@ -2,8 +2,8 @@
<app version="1"> <app version="1">
<name> USB Loader GX</name> <name> USB Loader GX</name>
<coder>USB Loader GX Team</coder> <coder>USB Loader GX Team</coder>
<version>3.0 r1213</version> <version>3.0 r1214</version>
<release_date>20130413145406</release_date> <release_date>20130430170233</release_date>
<!-- // remove this line to enable arguments <!-- // remove this line to enable arguments
<arguments> <arguments>
<arg>--ios=250</arg> <arg>--ios=250</arg>

View File

@ -48,7 +48,7 @@ static const char * DMLVersions[] =
"", // Original MIOS "", // Original MIOS
"r51-", // old DML r51- "r51-", // old DML r51-
"r52", // old DML r52 "r52", // old DML r52
"", // QuadForce 01 "v0.1", // QuadForce v0.1
"v1.2", // DML 1.2 "v1.2", // DML 1.2
"v1.4", // DML 1.4 "v1.4", // DML 1.4
"v1.4b", // DML 1.4b "v1.4b", // DML 1.4b
@ -75,6 +75,7 @@ static const char * DMLVersions[] =
"v2.8", // DM 2.8 "v2.8", // DM 2.8
"v2.9+", // DML 2.9 "v2.9+", // DML 2.9
"v2.9+", // DM 2.9 "v2.9+", // DM 2.9
"v2.0", // QuadForce v2.0
}; };
@ -299,7 +300,7 @@ void WindowCredits()
else if (currentMIOS == DIOS_MIOS_LITE) else if (currentMIOS == DIOS_MIOS_LITE)
snprintf(GCInfo, sizeof(GCInfo), "DIOS-MIOS Lite %s", DMLVersions[IosLoader::GetDMLVersion()]); snprintf(GCInfo, sizeof(GCInfo), "DIOS-MIOS Lite %s", DMLVersions[IosLoader::GetDMLVersion()]);
else if (currentMIOS == QUADFORCE) else if (currentMIOS == QUADFORCE)
snprintf(GCInfo, sizeof(GCInfo), "QuadForce"); snprintf(GCInfo, sizeof(GCInfo), "QuadForce %s", DMLVersions[IosLoader::GetDMLVersion()]);
// Check if Devolution is available // Check if Devolution is available
char DEVO_loader_path[100]; char DEVO_loader_path[100];

View File

@ -245,8 +245,16 @@ u8 IosLoader::GetMIOSInfo(bool checkedOnBoot)
else if((*(u32*)(appfile+i)) == 'Quad' && (*(u32*)(appfile+i+4)) == 'Forc') else if((*(u32*)(appfile+i)) == 'Quad' && (*(u32*)(appfile+i+4)) == 'Forc')
{ {
currentMIOS = QUADFORCE; currentMIOS = QUADFORCE;
gprintf("QuadForce v0.1"); if((*(u32*)(appfile+i+8)) == 'e 2.') // QuadForce 2.0
{
gprintf("QuadForce v2.0 \n");
currentDMLVersion = DML_VERSION_QUAD_2_0;
}
else // QuadForce 0.1
{
gprintf("QuadForce v0.1 \n");
currentDMLVersion = DML_VERSION_QUAD_0_1; currentDMLVersion = DML_VERSION_QUAD_0_1;
}
break; break;
} }
} }

View File

@ -59,6 +59,7 @@ enum DMLVersions
DML_VERSION_DM_2_8, // Feb 24 2013 14:17:03 DML_VERSION_DM_2_8, // Feb 24 2013 14:17:03
DML_VERSION_DML_2_9, // Apr 5 2013 18:20:33 DML_VERSION_DML_2_9, // Apr 5 2013 18:20:33
DML_VERSION_DM_2_9, // Apr 5 2013 18:29:35 DML_VERSION_DM_2_9, // Apr 5 2013 18:29:35
DML_VERSION_QUAD_2_0, // Apr 30 2013 17:31:32
DML_VERSION_MAX_VERSION, DML_VERSION_MAX_VERSION,
}; };