Misc fixes, renamed "Updated SysNAND" to reflect what the option actually does now

This commit is contained in:
Aurora 2016-04-15 15:58:40 +02:00
parent 7eebfd4f6a
commit fea5a111a9
4 changed files with 12 additions and 6 deletions

View File

@ -23,7 +23,7 @@ void configureCFW(const char *configPath)
"New 3DS CPU: Off( ) Clock( ) L2( ) Clock+L2( )" };
const char *singleOptionsText[] = { "( ) Autoboot SysNAND",
"( ) Updated SysNAND mode (A9LH-only)",
"( ) Use SysNAND FIRM as default (A9LH-only)",
"( ) Force A9LH detection",
"( ) Use second EmuNAND as default",
"( ) Enable region/language emulation",

View File

@ -55,6 +55,8 @@ void main(void)
//Determine if this is a firmlaunch boot
if(*(vu8 *)0x23F00005)
{
if(needConfig == 2) shutDown();
bootType = 1;
//'0' = NATIVE_FIRM, '1' = TWL_FIRM, '2' = AGB_FIRM
@ -204,8 +206,7 @@ static inline void loadFirm(u32 firmType, u32 externalFirm)
fileRead(firm, path, firmSize);
//Check that the loaded FIRM matches the console
if((((u32)section[2].address >> 8) & 0xFF) != (console ? 0x60 : 0x68))
error("aurei/firmware.bin doesn't match this console,\nor it's encrypted");
if((((u32)section[2].address >> 8) & 0xFF) != (console ? 0x60 : 0x68)) firmSize = 0;
}
}
else firmSize = 0;

View File

@ -37,6 +37,12 @@ u32 waitInput(void)
return key;
}
void shutDown(void)
{
i2cWriteRegister(I2C_DEV_MCU, 0x20, 1);
while(1);
}
void error(const char *message)
{
initScreens();
@ -47,7 +53,5 @@ void error(const char *message)
waitInput();
//Shutdown
i2cWriteRegister(I2C_DEV_MCU, 0x20, 1);
while(1);
shutDown();
}

View File

@ -9,4 +9,5 @@
#include "types.h"
u32 waitInput(void);
void shutDown(void);
void error(const char *message);