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

Better errors

Browse Source
This commit is contained in:
Aurora 2016-03-23 04:06:21 +01:00
parent 279f39bc13
commit 887707ea87
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/firm.c
View File

@ -135,14 +135,14 @@ void loadFirm(void){
nandFirm0((u8 *)firmLocation, firmSize, console); nandFirm0((u8 *)firmLocation, firmSize, console);
//Check for correct decryption //Check for correct decryption
if(memcmp(firmLocation, "FIRM", 4) != 0) if(memcmp(firmLocation, "FIRM", 4) != 0)
error("Couldn't decrypt FIRM0 from NAND"); error("Couldn't decrypt NAND FIRM0 (O3DS not on 9.x?)");
} }
//Load FIRM from SD //Load FIRM from SD
else{ else{
const char *path = usePatchedFirm ? patchedFirms[selectedFirm - 1] : const char *path = usePatchedFirm ? patchedFirms[selectedFirm - 1] :
(mode ? "/aurei/firmware.bin" : "/aurei/firmware90.bin"); (mode ? "/aurei/firmware.bin" : "/aurei/firmware90.bin");
firmSize = fileSize(path); firmSize = fileSize(path);
if(!firmSize) error("firmware(90).bin doesn't exist"); if(!firmSize) error("aurei/firmware(90).bin doesn't exist");
fileRead((u8 *)firmLocation, path, firmSize); fileRead((u8 *)firmLocation, path, firmSize);
} }
@ -150,7 +150,7 @@ void loadFirm(void){
//Check that the loaded FIRM matches the console //Check that the loaded FIRM matches the console
if((((u32)section[2].address >> 8) & 0xFF) != (console ? 0x60 : 0x68)) if((((u32)section[2].address >> 8) & 0xFF) != (console ? 0x60 : 0x68))
error("firmware(90).bin doesn't match the console"); error("aurei/firmware(90).bin doesn't match this\nconsole, or it's encrypted");
arm9Section = (u8 *)firmLocation + section[2].offset; arm9Section = (u8 *)firmLocation + section[2].offset;
@ -168,7 +168,7 @@ static void loadEmu(u8 *proc9Offset){
//Read emunand code from SD //Read emunand code from SD
const char path[] = "/aurei/patches/emunand.bin"; const char path[] = "/aurei/patches/emunand.bin";
u32 size = fileSize(path); u32 size = fileSize(path);
if(!size) error("emunand.bin doesn't exist"); if(!size) error("aurei/patches/emunand.bin doesn't exist");
u8 *emuCodeOffset = getEmuCode(arm9Section, section[2].size, proc9Offset); u8 *emuCodeOffset = getEmuCode(arm9Section, section[2].size, proc9Offset);
fileRead(emuCodeOffset, path, size); fileRead(emuCodeOffset, path, size);
@ -220,7 +220,7 @@ void patchFirm(void){
//Read reboot code from SD //Read reboot code from SD
const char path[] = "/aurei/patches/reboot.bin"; const char path[] = "/aurei/patches/reboot.bin";
u32 size = fileSize(path); u32 size = fileSize(path);
if(!size) error("reboot.bin doesn't exist"); if(!size) error("aurei/patches/reboot.bin doesn't exist");
u8 *rebootOffset = getReboot(arm9Section, section[2].size); u8 *rebootOffset = getReboot(arm9Section, section[2].size);
fileRead(rebootOffset, path, size); fileRead(rebootOffset, path, size);