Fix wrong bootconfig being picked up by 3ds_injector, cleanup

injector/source/patcher.c

@@ -3,28 +3,7 @@
 #include "patcher.h"
 #include "ifile.h"
 
-typedef struct __attribute__((packed))
-{
-    char magic[4];
-    
-    u8 versionMajor;
-    u8 versionMinor;
-    u8 versionBuild;
-    u8 flags; /* bit 0: dev branch; bit 1: is release */
-
-    u32 commitHash;
-
-    u32 config;
-} CFWInfo;
-
-CFWInfo info = {0};
-
-#ifndef PATH_MAX
-#define PATH_MAX 255
-#define CONFIG(a) (((info.config >> (a + 16)) & 1) != 0)
-#define MULTICONFIG(a) ((info.config >> (a * 2 + 6)) & 3)
-#define BOOTCONFIG(a, b) ((info.config >> a) & b)
-#endif
+static CFWInfo info = {0};
 
 static int memcmp(const void *buf1, const void *buf2, u32 size)
 {
@@ -114,6 +93,7 @@ int __attribute__((naked)) svcGetCFWInfo(CFWInfo __attribute__((unused)) *out)
 static void loadCFWInfo(void)
 {
     static bool infoLoaded = false;
+
     if(!infoLoaded)
     {
         svcGetCFWInfo(&info);
@@ -122,9 +102,10 @@ static void loadCFWInfo(void)
         {
             IFile_Close(&file);
         }
-    }
+
         infoLoaded = true;
     }
+}
 
 static bool secureInfoExists(void)
 {
@@ -338,6 +319,7 @@ static void patchCfgGetRegion(u8 *code, u32 size, u8 regionId, u32 CFGUHandleOff
 void patchCode(u64 progId, u8 *code, u32 size)
 {
     loadCFWInfo();
+
     switch(progId)
     {
         case 0x0004003000008F02LL: // USA Menu

injector/source/patcher.h

@@ -2,4 +2,23 @@
 
 #include <3ds/types.h>
 
+#define PATH_MAX 255
+#define CONFIG(a) (((info.config >> (a + 16)) & 1) != 0)
+#define MULTICONFIG(a) ((info.config >> (a * 2 + 6)) & 3)
+#define BOOTCONFIG(a, b) ((info.config >> a) & b)
+
+typedef struct __attribute__((packed))
+{
+    char magic[4];
+    
+    u8 versionMajor;
+    u8 versionMinor;
+    u8 versionBuild;
+    u8 flags; /* bit 0: dev branch; bit 1: is release */
+
+    u32 commitHash;
+
+    u32 config;
+} CFWInfo;
+
 void patchCode(u64 progId, u8 *code, u32 size);

source/config.c

@@ -24,10 +24,9 @@
 #include "utils.h"
 #include "screen.h"
 #include "draw.h"
-#include "fs.h"
 #include "buttons.h"
 
-void configureCFW(const char *configPath)
+void configureCFW(void)
 {
     initScreens();
 
@@ -193,13 +192,6 @@ void configureCFW(const char *configPath)
     for(u32 i = 0; i < singleOptionsAmount; i++)
         config |= (singleOptions[i].enabled ? 1 : 0) << (i + 16);
 
-    if(!fileWrite(&config, configPath, 4))
-    {
-        createDirectory("luma");
-        if(!fileWrite(&config, configPath, 4))
-            error("Error writing the configuration file");
-    }
-
     //Wait for the pressed buttons to change
     while(HID_PAD == BUTTON_START);
 }

source/config.h

@@ -30,4 +30,4 @@
 
 extern u32 config;
 
-void configureCFW(const char *configPath);
+void configureCFW(void);

source/firm.c

@@ -100,7 +100,7 @@ void main(void)
         //Determine if the user chose to use the SysNAND FIRM as default for a R boot
         bool useSysAsDefault = isA9lh ? CONFIG(1) : false;
 
-        newConfig = (u32)isA9lh << 3;
+        newConfig = (config & 0xFFFFFFC0) | ((u32)isA9lh << 3);
 
         //If it's a MCU reboot, try to force boot options
         if(isA9lh && CFG_BOOTENV)
@@ -141,7 +141,7 @@ void main(void)
 
             if(shouldLoadConfigurationMenu)
             {
-                configureCFW(configPath);
+                configureCFW();
 
                 if(!pinExists && CONFIG(7)) newPin();
 
@@ -207,15 +207,19 @@ void main(void)
 
         /* If the boot configuration is different from previously, overwrite it.
            Just the no-forcing flag being set is not enough */
-        if((newConfig & 0x2F) != (config & 0x3F))
+        if((newConfig & 0xFFFFFFEF) != config)
         {
-            //Preserve user settings (last 26 bits)
-            newConfig |= config & 0xFFFFFFC0;
+            //Update the last boot configuration
+            config |= newConfig & 0x3F;
 
-            if(!fileWrite(&newConfig, configPath, 4))
+            if(!fileWrite(&config, configPath, 4))
+            {
+                createDirectory("luma");
+                if(!fileWrite(&config, configPath, 4))
                     error("Error writing the configuration file");
             }
         }
+    }
 
     u32 firmVersion = loadFirm(firmType);
 
@@ -335,56 +339,44 @@ static inline void patchSafeFirm(void)
     else patchFirmWriteSafe(arm9Section, section[2].size);
 }
 
-static inline void copySection0AndInjectSystemModules(FirmwareType firmType)
+static inline void copySection0AndInjectSystemModules(void)
 {
     u8 *arm11Section0 = (u8 *)firm + section[0].offset;
 
     struct
     {
         u32 size;
-        char name[8];
         const u8 *addr;
-    } modules[5] = {{0}};
+    } modules[5];
 
-    u8 *pos = arm11Section0, *end = pos + section[0].size;
-    u32 n = 0;
+    u32 n = 0,
+        loaderIndex;
+    u8 *pos = arm11Section0;
 
-    u32 loaderIndex = 0;
-    
-    while(pos < end)
+    for(u8 *end = pos + section[0].size; pos < end; pos += modules[n++].size)
     {
         modules[n].addr = pos;
         modules[n].size = *(u32 *)(pos + 0x104) * 0x200;
 
-        memcpy(modules[n].name, pos + 0x200, 8);
-        pos += modules[n].size;
-
-        if(firmType == NATIVE_FIRM && memcmp(modules[n].name, "loader", 7) == 0) loaderIndex = n;
-        n++;
+        if(memcmp(modules[n].addr + 0x200, "loader", 7) == 0) loaderIndex = n;
     }
 
-    if(firmType == NATIVE_FIRM)
-    {
-        modules[loaderIndex].size = injector_size;
     modules[loaderIndex].addr = injector;
-    }
+    modules[loaderIndex].size = injector_size;
 
     pos = section[0].address;
-    for(u32 i = 0; i < n; i++)
-    {
-        memcpy(pos, modules[i].addr, modules[i].size);
-        pos += modules[i].size;
-    }
 
+    for(u32 i = 0; i < n; pos += modules[i++].size)
+        memcpy(pos, modules[i].addr, modules[i].size);
 }
 
 static inline void launchFirm(FirmwareType firmType)
 {
     //If we're booting NATIVE_FIRM, section0 needs to be copied separately to inject 3ds_injector
     u32 sectionNum;
-    if(firmType != SAFE_FIRM)
+    if(firmType == NATIVE_FIRM)
     {
-        copySection0AndInjectSystemModules(firmType);
+        copySection0AndInjectSystemModules();
         sectionNum = 1;
     }
     else sectionNum = 0;

source/firm.h

@@ -53,5 +53,5 @@ static inline u32 loadFirm(FirmwareType firmType);
 static inline void patchNativeFirm(u32 firmVersion, FirmwareSource nandType, u32 emuHeader, bool isA9lh);
 static inline void patchLegacyFirm(FirmwareType firmType);
 static inline void patchSafeFirm(void);
-static inline void copySection0AndInjectSystemModules(FirmwareType firmType);
+static inline void copySection0AndInjectSystemModules(void);
 static inline void launchFirm(FirmwareType firmType);

source/patches.c

@@ -167,26 +167,10 @@ void reimplementSvcBackdoor(u8 *pos, u32 size)
     }
 }
 
-extern u32 config;
-
 void implementSvcGetCFWInfo(u8 *pos, u32 size)
 {
-    typedef struct __attribute__((packed))
-    {
-        char magic[4];
-        
-        u8 versionMajor;
-        u8 versionMinor;
-        u8 versionBuild;
-        u8 flags;
-
-        u32 commitHash;
-
-        u32 config;
-    } CFWInfo;
-
     const char *rev = REVISION;
-    bool isRelease = false;
+    bool isRelease;
 
     findArm11ExceptionsPageAndSvcHandlerAndTable(pos, size);
     findFreeK11Space(pos, size);

source/patches.h

@@ -33,7 +33,22 @@ typedef struct patchData {
     u32 type;
 } patchData;
 
+typedef struct __attribute__((packed))
+{
+    char magic[4];
+        
+    u8 versionMajor;
+    u8 versionMinor;
+    u8 versionBuild;
+    u8 flags;
+
+    u32 commitHash;
+
+    u32 config;
+} CFWInfo;
+
 extern bool isN3DS;
+extern u32 config;
 
 u8 *getProcess9(u8 *pos, u32 size, u32 *process9Size, u32 *process9MemAddr);
 void patchSignatureChecks(u8 *pos, u32 size);