Added multi redNAND support (thanks to @Desterly for the original commit)

Makes things more uniform

source/crypto.c

@@ -266,12 +266,12 @@ void decryptArm9Bin(u8 *arm9Section, u32 mode){
     u8 slot = mode ? 0x16 : 0x15;
 
     //Setup keys needed for arm9bin decryption
-    memcpy(keyY, arm9Section+0x10, 0x10);
-    memcpy(CTR, arm9Section+0x20, 0x10);
+    memcpy(keyY, arm9Section + 0x10, 0x10);
+    memcpy(CTR, arm9Section + 0x20, 0x10);
     u32 size = 0;
     //http://stackoverflow.com/questions/12791077/atoi-implementation-in-c
-    for(u8 *tmp = arm9Section+0x30; *tmp; tmp++)
-        size = (size<<3)+(size<<1)+(*tmp)-'0';
+    for(u8 *tmp = arm9Section + 0x30; *tmp; tmp++)
+        size = (size << 3) + (size << 1) + (*tmp) - '0';
 
     if(mode){
         u8 keyX[0x10];
@@ -279,7 +279,7 @@ void decryptArm9Bin(u8 *arm9Section, u32 mode){
         //Set 0x11 to key2 for the arm9bin and misc keys
         aes_setkey(0x11, key2, AES_KEYNORMAL, AES_INPUT_BE | AES_INPUT_NORMAL);
         aes_use_keyslot(0x11);
-        aes(keyX, arm9Section+0x60, 1, NULL, AES_ECB_DECRYPT_MODE, 0);
+        aes(keyX, arm9Section + 0x60, 1, NULL, AES_ECB_DECRYPT_MODE, 0);
         aes_setkey(slot, keyX, AES_KEYX, AES_INPUT_BE | AES_INPUT_NORMAL);
     }
 
@@ -288,14 +288,14 @@ void decryptArm9Bin(u8 *arm9Section, u32 mode){
     aes_use_keyslot(slot);
 
     //Decrypt arm9bin
-    aes(arm9Section+0x800, arm9Section+0x800, size/AES_BLOCK_SIZE, CTR, AES_CTR_MODE, AES_INPUT_BE | AES_INPUT_NORMAL);
+    aes(arm9Section + 0x800, arm9Section + 0x800, size/AES_BLOCK_SIZE, CTR, AES_CTR_MODE, AES_INPUT_BE | AES_INPUT_NORMAL);
 }
 
 //Sets the N3DS 9.6 KeyXs
 void setKeyXs(u8 *arm9Section){
 
-    u8 *keyData = arm9Section+0x89814;
-    u8 *decKey = keyData+0x10;
+    u8 *keyData = arm9Section + 0x89814;
+    u8 *decKey = keyData + 0x10;
 
     //Set keys 0x19..0x1F keyXs
     aes_setkey(0x11, key2, AES_KEYNORMAL, AES_INPUT_BE | AES_INPUT_NORMAL);
@@ -303,6 +303,6 @@ void setKeyXs(u8 *arm9Section){
     for(u8 slot = 0x19; slot < 0x20; slot++){
         aes(decKey, keyData, 1, NULL, AES_ECB_DECRYPT_MODE, 0);
         aes_setkey(slot, decKey, AES_KEYX, AES_INPUT_BE | AES_INPUT_NORMAL);
-        *(keyData+0xF) += 1;
+        *(keyData + 0xF) += 1;
     }
 }

source/emunand.c

@@ -15,17 +15,21 @@ void getEmunandSect(u32 *off, u32 *head, u32 emuNAND){
     u32 nandOffset = emuNAND == 1 ? 0 :
                                   (nandSize > 0x200000 ? 0x400000 : 0x200000);
 
+    //Check for Gateway emuNAND
     if(sdmmc_sdcard_readsectors(nandOffset + nandSize, 1, temp) == 0){
         if(*(u32 *)(temp + 0x100) == NCSD_MAGIC){
-            *off = nandOffset;
-            *head = nandOffset + nandSize;
+                *off = nandOffset;
+                *head = nandOffset + nandSize;
+        }
+        //Check for RedNAND
+        else if(sdmmc_sdcard_readsectors(nandOffset + 1, 1, temp) == 0){
+            if(*(u32 *)(temp + 0x100) == NCSD_MAGIC){
+                *off = nandOffset + 1;
+                *head = nandOffset + 1;
+            }
+            //Fallback to the first emuNAND if there's no second one
+            else if(emuNAND == 2) getEmunandSect(off, head, 1);
         }
-        //Fallback to the first emuNAND if there's no second one
-        else if(emuNAND == 2) getEmunandSect(off, head, 1);
-        //Check if a RedNAND is present
-        else if(sdmmc_sdcard_readsectors(1, 1, temp) == 0)
-            if(*(u32 *)(temp + 0x100) != NCSD_MAGIC)
-                *head = 0;
     }
 }
 
@@ -34,7 +38,7 @@ u32 getSDMMC(void *pos, u32 size){
     const unsigned char pattern[] = {0x21, 0x20, 0x18, 0x20};
     const u8 *off = (u8 *)memsearch(pos, pattern, size, 4) - 1;
 
-    return *(u32 *)(off+0x0A) + *(u32 *)(off+0x0E);
+    return *(u32 *)(off + 0x0A) + *(u32 *)(off + 0x0E);
 }
 
 void getEmuRW(void *pos, u32 size, u32 *readOff, u32 *writeOff){
@@ -45,16 +49,16 @@ void getEmuRW(void *pos, u32 size, u32 *readOff, u32 *writeOff){
     *readOff = (u32)memsearch((void *)(*writeOff - 0x1000), pattern, 0x1000, 4) - 6;
 }
 
-void *getMPU(void *pos, u32 size){
+u32 *getMPU(void *pos, u32 size){
     //Look for MPU pattern
     const unsigned char pattern[] = {0x03, 0x00, 0x24, 0x00};
 
-    return memsearch(pos, pattern, size, 4);
+    return (u32 *)memsearch(pos, pattern, size, 4);
 }
 
-void *getEmuCode(void *pos, u32 size, u8 *proc9Offset){
+void *getEmuCode(u8 *pos, u32 size, u8 *proc9Offset){
     const unsigned char pattern[] = {0x00, 0xFF, 0xFF, 0xFF};
  
     //Looking for the last free space before Process9
-    return (u8 *)memsearch(pos, pattern, size - (size - (u32)(proc9Offset - (u8 *)pos)), 4) + 0xD;
+    return (u8 *)memsearch(pos, pattern, size - (size - (u32)(proc9Offset - pos)), 4) + 0xD;
 }

source/emunand.h

@@ -13,5 +13,5 @@
 void getEmunandSect(u32 *off, u32 *head, u32 emuNAND);
 u32 getSDMMC(void *pos, u32 size);
 void getEmuRW(void *pos, u32 size, u32 *readOff, u32 *writeOff);
-void *getMPU(void *pos, u32 size);
-void *getEmuCode(void *pos, u32 size, u8 *proc9Offset);
+u32 *getMPU(void *pos, u32 size);
+void *getEmuCode(u8 *pos, u32 size, u8 *proc9Offset);

source/firm.c

@@ -50,10 +50,13 @@ void setupCFW(void){
     //Attempt to read the configuration file
     const char configPath[] = "aurei/config.bin";
     u16 config = 0;
-    u32 needConfig = fileRead((u8 *)&config, configPath, 2) ? 1 : 2;
+    u32 needConfig = fileRead(&config, configPath, 2) ? 1 : 2;
 
     //Determine if A9LH is installed
     if(a9lhBoot || (config >> 2) & 0x1){
+        if(pressed == SAFE_MODE)
+            error("Using Safe Mode would brick you, or remove A9LH!");
+
         a9lhSetup = 1;
         //Check setting for > 9.2 sysNAND
         updatedSys = config & 0x1;
@@ -81,9 +84,6 @@ void setupCFW(void){
         if((pressed & BUTTON_L1) && (pressed & PAYLOAD_BUTTONS) &&
            pressed != SAFE_MODE) loadPayload();
 
-        if(a9lhSetup && pressed == SAFE_MODE)
-            error("Using Safe Mode would brick you, or remove A9LH!");
-
         //If no configuration file exists or SELECT is held, load configuration menu
         if(needConfig == 2 || (pressed & BUTTON_SELECT))
             configureCFW(configPath);
@@ -92,7 +92,7 @@ void setupCFW(void){
         if(PDN_GPU_CNT != 0x1) loadSplash();
 
         /* If L is pressed, boot 9.0 FIRM */
-        if(pressed == BUTTON_L1) mode = 0;
+        if(pressed & BUTTON_L1) mode = 0;
 
         /* If L or R aren't pressed on a 9.0/9.2 sysNAND, or the 9.0 FIRM is selected
            or R is pressed on a > 9.2 sysNAND, boot emuNAND */
@@ -116,7 +116,7 @@ void setupCFW(void){
         if(bootConfig != (config & 0xFF00)){
             //Preserve user settings (first byte)
             u16 tempConfig = ((config & 0xFF) | bootConfig);
-            fileWrite((u8 *)&tempConfig, configPath, 2);
+            fileWrite(&tempConfig, configPath, 2);
         }
     }
 
@@ -148,7 +148,7 @@ void loadFirm(void){
                                 (mode ? "/aurei/firmware.bin" : "/aurei/firmware90.bin");
         firmSize = fileSize(path);
         if(!firmSize) error("aurei/firmware(90).bin doesn't exist");
-        fileRead((u8 *)firmLocation, path, firmSize);
+        fileRead(firmLocation, path, firmSize);
     }
 
     section = firmLocation->section;
@@ -165,8 +165,8 @@ void loadFirm(void){
 //NAND redirection
 static void loadEmu(u8 *proc9Offset){
 
-    u32 emuOffset = 1,
-        emuHeader = 1,
+    u32 emuOffset,
+        emuHeader = 0,
         emuRead,
         emuWrite;
 
@@ -176,7 +176,7 @@ static void loadEmu(u8 *proc9Offset){
     //No emuNAND detected
     if(!emuHeader) error("No emuNAND has been detected");
 
-    //Copy the emuNAND patch
+    //Copy emuNAND code
     void *emuCodeOffset = getEmuCode(arm9Section, section[2].size, proc9Offset);
     memcpy(emuCodeOffset, emunand, emunand_size);
 
@@ -191,17 +191,23 @@ static void loadEmu(u8 *proc9Offset){
     *pos_sdmmc = getSDMMC(arm9Section, section[2].size);
 
     //Calculate offset for the hooks
-    *(u32 *)(nandRedir + 4) = (u32)emuCodeOffset - (u32)firmLocation -
-                              section[2].offset + (u32)section[2].address;
+    u32 branchOffset = (u32)emuCodeOffset - (u32)firmLocation -
+                       section[2].offset + (u32)section[2].address;
 
     //Add emunand hooks
     getEmuRW(arm9Section, section[2].size, &emuRead, &emuWrite);
-    memcpy((void *)emuRead, nandRedir, sizeof(nandRedir));
-    memcpy((void *)emuWrite, nandRedir, sizeof(nandRedir));
+    *(u16 *)emuRead = nandRedir[0];
+    *((u16 *)emuRead + 1) = nandRedir[1];
+    *((u32 *)emuRead + 1) = branchOffset;
+    *(u16 *)emuWrite = nandRedir[0];
+    *((u16 *)emuWrite + 1) = nandRedir[1];
+    *((u32 *)emuWrite + 1) = branchOffset;
 
     //Set MPU for emu code region
-    void *mpuOffset = getMPU(arm9Section, section[2].size);
-    memcpy(mpuOffset, mpu, sizeof(mpu));
+    u32 *mpuOffset = getMPU(arm9Section, section[2].size);
+    *mpuOffset = mpuPatch[0];
+    *(mpuOffset + 6) = mpuPatch[1];
+    *(mpuOffset + 9) = mpuPatch[2];
 }
 
 //Patches
@@ -219,13 +225,17 @@ void patchFirm(void){
 
         //Patch FIRM reboots, not on 9.0 FIRM as it breaks firmlaunchhax
         if(mode){
-            //Read reboot code from SD
+            //Calculate offset for the firmlaunch code
             void *rebootOffset = getReboot(arm9Section, section[2].size);
+            //Calculate offset for the fOpen function
+            u32 fOpenOffset = getfOpen(proc9Offset, rebootOffset);
+
+            //Copy firmlaunch code
             memcpy(rebootOffset, reboot, reboot_size);
 
-            //Calculate the fOpen offset and put it in the right location
+            //Put the fOpen offset in the right location
             u32 *pos_fopen = (u32 *)memsearch(rebootOffset, "OPEN", reboot_size, 4);
-            *pos_fopen = getfOpen(arm9Section, section[2].size, proc9Offset);
+            *pos_fopen = fOpenOffset;
 
             //Patch path for emuNAND-patched FIRM
             if(emuNAND){
@@ -237,8 +247,9 @@ void patchFirm(void){
 
     if(a9lhSetup && !emuNAND){
         //Patch FIRM partitions writes on sysNAND to protect A9LH
-        void *writeOffset = getFirmWrite(arm9Section, section[2].size);
-        memcpy(writeOffset, writeBlock, sizeof(writeBlock));
+        u16 *writeOffset = getFirmWrite(arm9Section, section[2].size);
+        *writeOffset = writeBlock[0];
+        *(writeOffset + 1) = writeBlock[1];
     }
 
     //Disable signature checks
@@ -246,8 +257,9 @@ void patchFirm(void){
         sigOffset2;
 
     getSignatures(firmLocation, firmSize, &sigOffset, &sigOffset2);
-    memcpy((void *)sigOffset, sigPat1, sizeof(sigPat1));
-    memcpy((void *)sigOffset2, sigPat2, sizeof(sigPat2));
+    *(u16 *)sigOffset = sigPatch[0];
+    *(u16 *)sigOffset2 = sigPatch[0];
+    *((u16 *)sigOffset2 + 1) = sigPatch[1];
 
     //Patch ARM9 entrypoint on N3DS to skip arm9loader
     if(console)
@@ -255,7 +267,7 @@ void patchFirm(void){
 
     //Write patched FIRM to SD if needed
     if(selectedFirm)
-        if(!fileWrite((u8 *)firmLocation, patchedFirms[selectedFirm - 1], firmSize))
+        if(!fileWrite(firmLocation, patchedFirms[selectedFirm - 1], firmSize))
             error("Couldn't write the patched FIRM (no free space?)");
 }
 

source/fs.c

@@ -14,7 +14,7 @@ u32 mountSD(void){
     return 1;
 }
 
-u32 fileRead(u8 *dest, const char *path, u32 size){
+u32 fileRead(void *dest, const char *path, u32 size){
     FRESULT fr;
     FIL fp;
     unsigned int br = 0;
@@ -29,7 +29,7 @@ u32 fileRead(u8 *dest, const char *path, u32 size){
     return fr ? 0 : 1;
 }
 
-u32 fileWrite(const u8 *buffer, const char *path, u32 size){
+u32 fileWrite(const void *buffer, const char *path, u32 size){
     FRESULT fr;
     FIL fp;
     unsigned int br = 0;

source/fs.h

@@ -9,8 +9,8 @@
 #include "types.h"
 
 u32 mountSD(void);
-u32 fileRead(u8 *dest, const char *path, u32 size);
-u32 fileWrite(const u8 *buffer, const char *path, u32 size);
+u32 fileRead(void *dest, const char *path, u32 size);
+u32 fileWrite(const void *buffer, const char *path, u32 size);
 u32 fileSize(const char *path);
 u32 fileExists(const char *path);
 void fileDelete(const char *path);

source/memory.c

@@ -36,8 +36,7 @@ int memcmp(const void *buf1, const void *buf2, u32 size){
 }
 
 void *memsearch(void *start_pos, const void *search, u32 size, u32 size_search){
-    for(void *pos = start_pos + size - size_search; pos >= start_pos; pos--){
+    for(u8 *pos = (u8 *)start_pos + size - size_search; pos >= (u8 *)start_pos; pos--)
         if(memcmp(pos, search, size_search) == 0) return pos;
-    }
     return NULL;
 }

source/patches.c

@@ -11,19 +11,13 @@
 *                   Patches
 **************************************************/
 
-const u8 mpu[0x2C] = {
-    0x03, 0x00, 0x36, 0x00, 0x00, 0x00, 0x10, 0x10, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00, 0x36, 0x00, 
-    0x00, 0x00, 0x00, 0x20, 0x01, 0x01, 0x01, 0x01, 0x03, 0x06, 0x20, 0x00, 0x00, 0x00, 0x00, 0x08, 
-    0x01, 0x01, 0x01, 0x01, 0x03, 0x06, 0x1C, 0x00, 0x00, 0x00, 0x02, 0x08
-};
+const u32 mpuPatch[3] = {0x00360003, 0x00200603, 0x001C0603};
 
-//Branch to emunand function. To be filled in
-u8 nandRedir[0x08] = {0x00, 0x4C, 0xA0, 0x47, 0x00, 0x00, 0x00, 0x00};
+const u16 nandRedir[2] = {0x4C00, 0x47A0};
 
-const u8 sigPat1[2] = {0x00, 0x20};
-const u8 sigPat2[4] = {0x00, 0x20, 0x70, 0x47};
+const u16 sigPatch[2] = {0x2000, 0x4770};
 
-const u8 writeBlock[4] = {0x00, 0x20, 0xC0, 0x46};
+const u16 writeBlock[2] = {0x2000, 0x46C0};
 
 /**************************************************
 *                   Functions
@@ -49,22 +43,20 @@ void *getReboot(void *pos, u32 size){
     return (u8 *)memsearch(pos, pattern, size, 4) - 0x10;
 }
 
-u32 getfOpen(void *pos, u32 size, u8 *proc9Offset){
+u32 getfOpen(u8 *proc9Offset, void *rebootOffset){
     //Offset Process9 code gets loaded to in memory (defined in ExHeader)
     u32 p9MemAddr = *(u32 *)(proc9Offset + 0xC);
-    //Start of Process9 .code section (start of NCCH + ExeFS offset + ExeFS header size)
+    //Process9 code offset (start of NCCH + ExeFS offset + ExeFS header size)
     u32 p9CodeOff = (u32)(proc9Offset - 0x204) + (*(u32 *)(proc9Offset - 0x64) * 0x200) + 0x200;
 
-    //Calculate fOpen
-    const unsigned char pattern[] = {0xB0, 0x04, 0x98, 0x0D};
-
-    return (u32)memsearch(pos, pattern, size, 4) - 2 - p9CodeOff + p9MemAddr;
+    //Firmlaunch function offset - offset in BLX opcode (A4-16 - ARM DDI 0100E) + 1
+    return (u32)rebootOffset + 9 - (-((*(u32 *)rebootOffset & 0x00FFFFFF) << 2) & 0xFFFFF) - p9CodeOff + p9MemAddr;
 }
 
-void *getFirmWrite(void *pos, u32 size){
+u16 *getFirmWrite(void *pos, u32 size){
     //Look for FIRM writing code
-    u8 *firmwrite = (u8 *)memsearch(pos, "exe:", size, 4);
+    u8 *const off = (u8 *)memsearch(pos, "exe:", size, 4);
     const unsigned char pattern[] = {0x00, 0x28, 0x01, 0xDA};
 
-    return memsearch(firmwrite - 0x100, pattern, 0x100, 4);
+    return (u16 *)memsearch(off - 0x100, pattern, 0x100, 4);
 }

source/patches.h

@@ -11,11 +11,10 @@
 /**************************************************
 *                   Patches
 **************************************************/
-const u8 mpu[0x2C];       
-u8 nandRedir[0x08];
-const u8 sigPat1[2];
-const u8 sigPat2[4];
-const u8 writeBlock[4];
+const u32 mpuPatch[3];       
+const u16 nandRedir[2];
+const u16 sigPatch[2];
+const u16 writeBlock[2];
 
 /**************************************************
 *                   Functions
@@ -23,5 +22,5 @@ const u8 writeBlock[4];
 u8 *getProc9(void *pos, u32 size);
 void getSignatures(void *pos, u32 size, u32 *off, u32 *off2);
 void *getReboot(void *pos, u32 size);
-u32 getfOpen(void *pos, u32 size, u8 *proc9Offset);
-void *getFirmWrite(void *pos, u32 size);
+u32 getfOpen(u8 *proc9Offset, void *rebootOffset);
+u16 *getFirmWrite(void *pos, u32 size);

source/utils.c

@@ -42,9 +42,9 @@ static u16 waitInput(void){
         for(u32 i = 0x13000; i; i--){
             if (key != HID_PAD)
                 break;
-            if(i==1) pressedkey = 1;
+            if(i == 1) pressedkey = 1;
         }
-    } while (!pressedkey);
+    } while(!pressedkey);
 
     return key;
 }
@@ -63,7 +63,7 @@ void configureCFW(const char *configPath){
 
     //Read and parse the existing configuration
     u16 tempConfig = 0;
-    fileRead((u8 *)&tempConfig, configPath, 2);
+    fileRead(&tempConfig, configPath, 2);
     for(u32 i = 0; i < OPTIONS; i++)
         options.enabled[i] = (tempConfig >> i) & 0x1;
 
@@ -94,7 +94,7 @@ void configureCFW(const char *configPath){
     //Parse and write the selected options
     for(u32 i = 0; i < OPTIONS; i++)
         tempConfig |= options.enabled[i] << i;
-    fileWrite((u8 *)&tempConfig, configPath, 2);
+    fileWrite(&tempConfig, configPath, 2);
 
     //Reboot
     i2cWriteRegister(I2C_DEV_MCU, 0x20, 1 << 2);