Set 0x18..0x1F only on O3DS

This commit is contained in:
TuxSH 2017-05-18 01:24:35 +02:00
parent 8636a74ba4
commit 1d4245e582
3 changed files with 2 additions and 14 deletions

View File

@ -125,9 +125,6 @@ u32 patchNativeFirm(u32 firmVersion, FirmwareSource nandType, u32 emuHeader, boo
firm->arm9Entry = (u8 *)0x801B01C; firm->arm9Entry = (u8 *)0x801B01C;
} }
if(!ISN3DS)
kernel9Loader(NULL); //Just set the N3DS 9.6+ keys even on O3DS
//Find the Process9 .code location, size and memory address //Find the Process9 .code location, size and memory address
u32 process9Size, u32 process9Size,
process9MemAddr; process9MemAddr;
@ -227,8 +224,6 @@ u32 patchTwlFirm(u32 firmVersion, bool doUnitinfoPatch)
kernel9Loader((Arm9Bin *)arm9Section); kernel9Loader((Arm9Bin *)arm9Section);
firm->arm9Entry = (u8 *)0x801301C; firm->arm9Entry = (u8 *)0x801301C;
} }
else
kernel9Loader(NULL); //Just set the keys
//Find the Process9 .code location, size and memory address //Find the Process9 .code location, size and memory address
u32 process9Size, u32 process9Size,
@ -262,8 +257,6 @@ u32 patchAgbFirm(bool doUnitinfoPatch)
kernel9Loader((Arm9Bin *)arm9Section); kernel9Loader((Arm9Bin *)arm9Section);
firm->arm9Entry = (u8 *)0x801301C; firm->arm9Entry = (u8 *)0x801301C;
} }
else
kernel9Loader(NULL); //Just set the keys
//Find the Process9 .code location, size and memory address //Find the Process9 .code location, size and memory address
u32 process9Size, u32 process9Size,
@ -292,8 +285,6 @@ u32 patch1x2xNativeAndSafeFirm(bool enableExceptionHandlers)
kernel9Loader((Arm9Bin *)arm9Section); kernel9Loader((Arm9Bin *)arm9Section);
firm->arm9Entry = (u8 *)0x801B01C; firm->arm9Entry = (u8 *)0x801B01C;
} }
else
kernel9Loader(NULL); //Just set the keys
//Find the Process9 .code location, size and memory address //Find the Process9 .code location, size and memory address
u32 process9Size, u32 process9Size,

View File

@ -163,6 +163,7 @@ void loadPayload(u32 pressed, const char *payloadPath)
memcpy(loaderAddress, loader_bin, loader_bin_size); memcpy(loaderAddress, loader_bin, loader_bin_size);
if(ISN3DS) kernel9Loader(NULL);
backupAndRestoreShaHash(true); backupAndRestoreShaHash(true);
initScreens(); initScreens();

View File

@ -158,11 +158,7 @@ void main(void)
pressed = HID_PAD; pressed = HID_PAD;
} }
else if(((pressed & SINGLE_PAYLOAD_BUTTONS) && !(pressed & (BUTTON_L1 | BUTTON_R1 | BUTTON_A))) || else if(((pressed & SINGLE_PAYLOAD_BUTTONS) && !(pressed & (BUTTON_L1 | BUTTON_R1 | BUTTON_A))) ||
((pressed & L_PAYLOAD_BUTTONS) && (pressed & BUTTON_L1))) ((pressed & L_PAYLOAD_BUTTONS) && (pressed & BUTTON_L1))) loadPayload(pressed, NULL);
{
kernel9Loader(NULL);
loadPayload(pressed, NULL);
}
if(splashMode == 2) loadSplash(); if(splashMode == 2) loadSplash();