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

Fixed signature patterns searching area, aligned variable/function names to the latest ReiNand

Browse Source
This commit is contained in:
Aurora 2016-03-27 19:19:35 +02:00
parent 034e63669a
commit e8ebb2f7fe
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/firm.c
View File

@ -20,7 +20,7 @@
//FIRM patches version //FIRM patches version
#define PATCH_VER 1 #define PATCH_VER 1
static firmHeader *const firmLocation = (firmHeader *)0x24000000; static firmHeader *const firm = (firmHeader *)0x24000000;
static const firmSectionHeader *section; static const firmSectionHeader *section;
static u8 *arm9Section; static u8 *arm9Section;
static const char *patchedFirms[] = { "/aurei/patched_firmware_sys.bin", static const char *patchedFirms[] = { "/aurei/patched_firmware_sys.bin",
@ -142,9 +142,9 @@ void loadFirm(void){
if(!usePatchedFirm && !a9lhSetup && !mode){ if(!usePatchedFirm && !a9lhSetup && !mode){
//Read FIRM from NAND and write to FCRAM //Read FIRM from NAND and write to FCRAM
firmSize = console ? 0xF2000 : 0xE9000; firmSize = console ? 0xF2000 : 0xE9000;
nandFirm0((u8 *)firmLocation, firmSize, console); nandFirm0((u8 *)firm, firmSize, console);
//Check for correct decryption //Check for correct decryption
if(memcmp(firmLocation, "FIRM", 4) != 0) if(memcmp(firm, "FIRM", 4) != 0)
error("Couldn't decrypt NAND FIRM0 (O3DS not on 9.x?)"); error("Couldn't decrypt NAND FIRM0 (O3DS not on 9.x?)");
} }
//Load FIRM from SD //Load FIRM from SD
@ -153,16 +153,16 @@ void loadFirm(void){
(mode ? "/aurei/firmware.bin" : "/aurei/firmware90.bin"); (mode ? "/aurei/firmware.bin" : "/aurei/firmware90.bin");
firmSize = fileSize(path); firmSize = fileSize(path);
if(!firmSize) error("aurei/firmware(90).bin doesn't exist"); if(!firmSize) error("aurei/firmware(90).bin doesn't exist");
fileRead(firmLocation, path, firmSize); fileRead(firm, path, firmSize);
} }
section = firmLocation->section; section = firm->section;
//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("aurei/firmware(90).bin doesn't match this\nconsole, or it's encrypted"); error("aurei/firmware(90).bin doesn't match this\nconsole, or it's encrypted");
arm9Section = (u8 *)firmLocation + section[2].offset; arm9Section = (u8 *)firm + section[2].offset;
if(console && !usePatchedFirm) decryptArm9Bin(arm9Section, mode); if(console && !usePatchedFirm) decryptArm9Bin(arm9Section, mode);
} }
@ -196,7 +196,7 @@ static void loadEmu(u8 *proc9Offset){
*pos_sdmmc = getSDMMC(arm9Section, section[2].size); *pos_sdmmc = getSDMMC(arm9Section, section[2].size);
//Calculate offset for the hooks //Calculate offset for the hooks
u32 branchOffset = (u32)emuCodeOffset - (u32)firmLocation - u32 branchOffset = (u32)emuCodeOffset - (u32)firm -
section[2].offset + (u32)section[2].address; section[2].offset + (u32)section[2].address;
//Add emunand hooks //Add emunand hooks
@ -261,18 +261,18 @@ void patchFirm(void){
u32 sigOffset, u32 sigOffset,
sigOffset2; sigOffset2;
getSignatures(firmLocation, firmSize, &sigOffset, &sigOffset2); getSigChecks(arm9Section, section[2].size, &sigOffset, &sigOffset2);
*(u16 *)sigOffset = sigPatch[0]; *(u16 *)sigOffset = sigPatch[0];
*(u16 *)sigOffset2 = sigPatch[0]; *(u16 *)sigOffset2 = sigPatch[0];
*((u16 *)sigOffset2 + 1) = sigPatch[1]; *((u16 *)sigOffset2 + 1) = sigPatch[1];
//Patch ARM9 entrypoint on N3DS to skip arm9loader //Patch ARM9 entrypoint on N3DS to skip arm9loader
if(console) if(console)
firmLocation->arm9Entry = (u8 *)0x801B01C; firm->arm9Entry = (u8 *)0x801B01C;
//Write patched FIRM to SD if needed //Write patched FIRM to SD if needed
if(selectedFirm) if(selectedFirm)
if(!fileWrite(firmLocation, patchedFirms[selectedFirm - 1], firmSize)) if(!fileWrite(firm, patchedFirms[selectedFirm - 1], firmSize))
error("Couldn't write the patched FIRM (no free space?)"); error("Couldn't write the patched FIRM (no free space?)");
} }
@ -281,16 +281,16 @@ void launchFirm(void){
if(console && mode) setKeyXs(arm9Section); if(console && mode) setKeyXs(arm9Section);
//Copy firm partitions to respective memory locations //Copy firm partitions to respective memory locations
memcpy(section[0].address, (u8 *)firmLocation + section[0].offset, section[0].size); memcpy(section[0].address, (u8 *)firm + section[0].offset, section[0].size);
memcpy(section[1].address, (u8 *)firmLocation + section[1].offset, section[1].size); memcpy(section[1].address, (u8 *)firm + section[1].offset, section[1].size);
memcpy(section[2].address, arm9Section, section[2].size); memcpy(section[2].address, arm9Section, section[2].size);
//Fixes N3DS 3D //Fixes N3DS 3D
deinitScreens(); deinitScreens();
//Set ARM11 kernel entrypoint //Set ARM11 kernel entrypoint
*(vu32 *)0x1FFFFFF8 = (u32)firmLocation->arm11Entry; *(vu32 *)0x1FFFFFF8 = (u32)firm->arm11Entry;
//Final jump to arm9 kernel //Final jump to arm9 kernel
((void (*)())firmLocation->arm9Entry)(); ((void (*)())firm->arm9Entry)();
} }

2
source/patches.c
View File

@ -27,7 +27,7 @@ u8 *getProc9(void *pos, u32 size){
return (u8 *)memsearch(pos, "ess9", size, 4); return (u8 *)memsearch(pos, "ess9", size, 4);
} }
void getSignatures(void *pos, u32 size, u32 *off, u32 *off2){ void getSigChecks(void *pos, u32 size, u32 *off, u32 *off2){
//Look for signature checks //Look for signature checks
const u8 pattern[] = {0xC0, 0x1C, 0x76, 0xE7}; const u8 pattern[] = {0xC0, 0x1C, 0x76, 0xE7};
const u8 pattern2[] = {0xB5, 0x22, 0x4D, 0x0C}; const u8 pattern2[] = {0xB5, 0x22, 0x4D, 0x0C};

2
source/patches.h
View File

@ -20,7 +20,7 @@ const u16 writeBlock[2];
* Functions * Functions
**************************************************/ **************************************************/
u8 *getProc9(void *pos, u32 size); u8 *getProc9(void *pos, u32 size);
void getSignatures(void *pos, u32 size, u32 *off, u32 *off2); void getSigChecks(void *pos, u32 size, u32 *off, u32 *off2);
void *getReboot(void *pos, u32 size); void *getReboot(void *pos, u32 size);
u32 getfOpen(u8 *proc9Offset, void *rebootOffset); u32 getfOpen(u8 *proc9Offset, void *rebootOffset);
u16 *getFirmWrite(void *pos, u32 size); u16 *getFirmWrite(void *pos, u32 size);

2
source/screeninit.c
View File

@ -11,7 +11,7 @@
#include "draw.h" #include "draw.h"
#include "i2c.h" #include "i2c.h"
static vu32 *const arm11 = (vu32 *)0x1FFFFFF8; static vu32 *const arm11 = (u32 *)0x1FFFFFF8;
void deinitScreens(void){ void deinitScreens(void){
void __attribute__((naked)) ARM11(void){ void __attribute__((naked)) ARM11(void){