LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Make error() reboot if in a firmlaunch environment, improve errors

Browse Source
This commit is contained in:
Aurora 2016-09-22 22:35:17 +02:00
parent 2cc46c618b
commit 2cbaf39fd5
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/crypto.c
View File

@ -486,8 +486,8 @@ void computePinHash(u8 *outbuf, const u8 *inbuf)
if(!didShaHashBackup) if(!didShaHashBackup)
{ {
didShaHashBackup = true;
memcpy(shaHashBackup, (void *)REG_SHA_HASH, sizeof(shaHashBackup)); memcpy(shaHashBackup, (void *)REG_SHA_HASH, sizeof(shaHashBackup));
didShaHashBackup = true;
} }
sdmmc_get_cid(1, (u32 *)cid); sdmmc_get_cid(1, (u32 *)cid);

19
source/firm.c
View File

@ -295,9 +295,9 @@ static inline u32 loadFirm(FirmwareType *firmType, FirmwareSource firmSource, bo
{ {
//We can't boot < 3.x EmuNANDs //We can't boot < 3.x EmuNANDs
if(firmSource != FIRMWARE_SYSNAND) if(firmSource != FIRMWARE_SYSNAND)
error("An old unsupported EmuNAND has been detected.\nLuma3DS is unable to boot it"); error("An old unsupported EmuNAND has been detected.\nLuma3DS is unable to boot it.");
if(BOOTCFG_SAFEMODE != 0) error("SAFE_MODE is not supported on 1.x/2.x FIRM"); if(BOOTCFG_SAFEMODE != 0) error("SAFE_MODE is not supported on 1.x/2.x FIRM.");
*firmType = NATIVE_FIRM1X2X; *firmType = NATIVE_FIRM1X2X;
} }
@ -312,23 +312,18 @@ static inline u32 loadFirm(FirmwareType *firmType, FirmwareSource firmSource, bo
if(firmSize > 0) if(firmSize > 0)
{ {
bool isValidFirm = true;
if(memcmp(firm, "FIRM", 4) != 0) if(memcmp(firm, "FIRM", 4) != 0)
{ {
u8 cetk[0xA50]; u8 cetk[0xA50];
if(fileRead(cetk, *firmType == NATIVE_FIRM1X2X ? cetkFiles[0] : cetkFiles[(u32)*firmType], sizeof(cetk)) == sizeof(cetk)) if(fileRead(cetk, *firmType == NATIVE_FIRM1X2X ? cetkFiles[0] : cetkFiles[(u32)*firmType], sizeof(cetk)) == sizeof(cetk))
decryptNusFirm(cetk, (u8 *)firm, firmSize); decryptNusFirm(cetk, (u8 *)firm, firmSize);
else isValidFirm = false; else error("The firmware.bin in /luma is encrypted\nor corrupted.");
} }
//Check that the SD FIRM is decrypted and is right for the console from the ARM9 section address //Check that the SD FIRM is right for the console from the ARM9 section address
if(isValidFirm && (section[3].offset ? section[3].address : section[2].address) != (isN3DS ? (u8 *)0x8006000 : (u8 *)0x8006800)) if((section[3].offset ? section[3].address : section[2].address) != (isN3DS ? (u8 *)0x8006000 : (u8 *)0x8006800))
{ error("The firmware.bin in /luma is not valid for this\nconsole.");
if(isFirmlaunch) mcuReboot();
error("The firmware.bin in /luma is not valid for your\nconsole, or corrupted");
}
firmVersion = 0xFFFFFFFF; firmVersion = 0xFFFFFFFF;
} }
@ -336,7 +331,7 @@ static inline u32 loadFirm(FirmwareType *firmType, FirmwareSource firmSource, bo
if(firmVersion != 0xFFFFFFFF) if(firmVersion != 0xFFFFFFFF)
{ {
if(mustLoadFromSd) error("An old unsupported FIRM has been detected.\nCopy a firmware.bin in /luma to boot"); if(mustLoadFromSd) error("An old unsupported FIRM has been detected.\nCopy a firmware.bin in /luma to boot.");
decryptExeFs((u8 *)firm); decryptExeFs((u8 *)firm);
} }

2
source/utils.c
View File

@ -112,6 +112,8 @@ void chrono(u32 seconds)
void error(const char *message) void error(const char *message)
{ {
if(isFirmlaunch) mcuReboot();
initScreens(); initScreens();
drawString("An error has occurred:", true, 10, 10, COLOR_RED); drawString("An error has occurred:", true, 10, 10, COLOR_RED);