From e8ebb2f7fe9dccd6e5034cc07435795c63bab62b Mon Sep 17 00:00:00 2001
From: Aurora <davidone92@katamail.com>
Date: Sun, 27 Mar 2016 19:19:35 +0200
Subject: [PATCH] Fixed signature patterns searching area, aligned
 variable/function names to the latest ReiNand

---
 source/firm.c       | 28 ++++++++++++++--------------
 source/patches.c    |  2 +-
 source/patches.h    |  2 +-
 source/screeninit.c |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/source/firm.c b/source/firm.c
index d2a14d1..dbd3a45 100755
--- a/source/firm.c
+++ b/source/firm.c
@@ -20,7 +20,7 @@
 //FIRM patches version
 #define PATCH_VER 1
 
-static firmHeader *const firmLocation = (firmHeader *)0x24000000;
+static firmHeader *const firm = (firmHeader *)0x24000000;
 static const firmSectionHeader *section;
 static u8 *arm9Section;
 static const char *patchedFirms[] = { "/aurei/patched_firmware_sys.bin",
@@ -142,9 +142,9 @@ void loadFirm(void){
     if(!usePatchedFirm && !a9lhSetup && !mode){
         //Read FIRM from NAND and write to FCRAM
         firmSize = console ? 0xF2000 : 0xE9000;
-        nandFirm0((u8 *)firmLocation, firmSize, console);
+        nandFirm0((u8 *)firm, firmSize, console);
         //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?)");
     }
     //Load FIRM from SD
@@ -153,16 +153,16 @@ void loadFirm(void){
                                 (mode ? "/aurei/firmware.bin" : "/aurei/firmware90.bin");
         firmSize = fileSize(path);
         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
     if((((u32)section[2].address >> 8) & 0xFF) != (console ? 0x60 : 0x68))
         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);
 }
@@ -196,7 +196,7 @@ static void loadEmu(u8 *proc9Offset){
     *pos_sdmmc = getSDMMC(arm9Section, section[2].size);
 
     //Calculate offset for the hooks
-    u32 branchOffset = (u32)emuCodeOffset - (u32)firmLocation -
+    u32 branchOffset = (u32)emuCodeOffset - (u32)firm -
                        section[2].offset + (u32)section[2].address;
 
     //Add emunand hooks
@@ -261,18 +261,18 @@ void patchFirm(void){
     u32 sigOffset,
         sigOffset2;
 
-    getSignatures(firmLocation, firmSize, &sigOffset, &sigOffset2);
+    getSigChecks(arm9Section, section[2].size, &sigOffset, &sigOffset2);
     *(u16 *)sigOffset = sigPatch[0];
     *(u16 *)sigOffset2 = sigPatch[0];
     *((u16 *)sigOffset2 + 1) = sigPatch[1];
 
     //Patch ARM9 entrypoint on N3DS to skip arm9loader
     if(console)
-        firmLocation->arm9Entry = (u8 *)0x801B01C;
+        firm->arm9Entry = (u8 *)0x801B01C;
 
     //Write patched FIRM to SD if needed
     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?)");
 }
 
@@ -281,16 +281,16 @@ void launchFirm(void){
     if(console && mode) setKeyXs(arm9Section);
 
     //Copy firm partitions to respective memory locations
-    memcpy(section[0].address, (u8 *)firmLocation + section[0].offset, section[0].size);
-    memcpy(section[1].address, (u8 *)firmLocation + section[1].offset, section[1].size);
+    memcpy(section[0].address, (u8 *)firm + section[0].offset, section[0].size);
+    memcpy(section[1].address, (u8 *)firm + section[1].offset, section[1].size);
     memcpy(section[2].address, arm9Section, section[2].size);
 
     //Fixes N3DS 3D
     deinitScreens();
 
     //Set ARM11 kernel entrypoint
-    *(vu32 *)0x1FFFFFF8 = (u32)firmLocation->arm11Entry;
+    *(vu32 *)0x1FFFFFF8 = (u32)firm->arm11Entry;
 
     //Final jump to arm9 kernel
-    ((void (*)())firmLocation->arm9Entry)();
+    ((void (*)())firm->arm9Entry)();
 }
\ No newline at end of file
diff --git a/source/patches.c b/source/patches.c
index 3ba7dd3..60c10d4 100644
--- a/source/patches.c
+++ b/source/patches.c
@@ -27,7 +27,7 @@ u8 *getProc9(void *pos, u32 size){
     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
     const u8 pattern[] = {0xC0, 0x1C, 0x76, 0xE7};
     const u8 pattern2[] = {0xB5, 0x22, 0x4D, 0x0C};
diff --git a/source/patches.h b/source/patches.h
index 44fd06d..fd5876c 100644
--- a/source/patches.h
+++ b/source/patches.h
@@ -20,7 +20,7 @@ const u16 writeBlock[2];
 *                   Functions
 **************************************************/
 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);
 u32 getfOpen(u8 *proc9Offset, void *rebootOffset);
 u16 *getFirmWrite(void *pos, u32 size);
\ No newline at end of file
diff --git a/source/screeninit.c b/source/screeninit.c
index 7b438f0..d1293ce 100644
--- a/source/screeninit.c
+++ b/source/screeninit.c
@@ -11,7 +11,7 @@
 #include "draw.h"
 #include "i2c.h"
 
-static vu32 *const arm11 = (vu32 *)0x1FFFFFF8;
+static vu32 *const arm11 = (u32 *)0x1FFFFFF8;
 
 void deinitScreens(void){
     void __attribute__((naked)) ARM11(void){