v2.6 Release Commit...

* Ensure SD access when SCFG unlock setting is true. Allows dsxTool SD access for DSXtreme. * Previously mentioned improvements from previous commit.
ApacheThunder · Sep 23, 2023 · 3c1568b · 3c1568b
1 parent e3a7cfb
commit 3c1568b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/BootLoader/source/common.h b/BootLoader/source/common.h
@@ -36,10 +36,10 @@ typedef enum {ARM9_BOOT, ARM9_START, ARM9_MEMCLR, ARM9_READY, ARM9_BOOTBIN, ARM9
 extern tNDSHeader* ndsHeader;
 
 extern bool arm9_dsiModeConfirmed;
+extern bool arm9_ExtendRam;
 extern bool arm9_boostVram;
 extern bool arm9_scfgUnlock;
 extern bool arm9_TWLClockSpeeds;
-extern bool arm9_ExtendRam;
 extern bool arm9_DebugMode;
 
 extern volatile int arm9_stateFlag;

diff --git a/BootLoader/source/main.arm7.c b/BootLoader/source/main.arm7.c
@@ -805,8 +805,8 @@ void arm7_main (void) {
 	arm9_dsiModeConfirmed = twlMode;
 	arm9_TWLClockSpeeds = twlClock;
 	arm9_boostVram = boostVram;
-	arm9_scfgUnlock = scfgUnlock;	
-	arm9_ExtendRam = extendRam;	
+	arm9_scfgUnlock = scfgUnlock;
+	arm9_ExtendRam = extendRam;
 
 	if (twlClock) {
 		// if (!sdAccess) { REG_SCFG_CLK = 0x0186; } else { REG_SCFG_CLK = 0x0187; }
@@ -815,8 +815,8 @@ void arm7_main (void) {
 		// if (!sdAccess) { REG_SCFG_CLK = 0x0180; } else { REG_SCFG_CLK = 0x0181; }
 		REG_SCFG_CLK = 0x0101;
 	}
+
 	if (twlMode) { REG_SCFG_EXT = 0x92FBFB06; } else { REG_SCFG_EXT = 0x92A00000; }
-	//  if (sdAccess) { REG_SCFG_EXT |= BIT(18); }
 	if (scfgUnlock) { REG_SCFG_EXT |= BIT(18); } else { REG_SCFG_EXT &= ~(1UL << 31); }
 
 	while (arm9_stateFlag != ARM9_READY);

diff --git a/BootLoader/source/main.arm9.c b/BootLoader/source/main.arm9.c
@@ -322,7 +322,7 @@ void __attribute__((target("arm"))) arm9_main (void) {
 		if (arm9_ExtendRam) {
 			REG_SCFG_EXT |= BIT(14);
 			REG_SCFG_EXT |= BIT(15);
-		}		
+		}
 		// Extended VRAM Access
 		if (arm9_boostVram)REG_SCFG_EXT |= BIT(13);
 		// lock SCFG