Slot-1: SCFG setting no longer overrides SD access setting

DS-Homebrew · Sep 29, 2024 · 9ce7116 · 9ce7116
1 parent 09941f2
commit 9ce7116
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/booter_fc/arm7/source/main.c b/booter_fc/arm7/source/main.c
@@ -70,9 +70,15 @@ void powerButtonCB() {
 //---------------------------------------------------------------------------------
 int main() {
 //---------------------------------------------------------------------------------
-	REG_SCFG_ROM = 0x101;
-	REG_SCFG_CLK = (BIT(0) | BIT(1) | BIT(2) | BIT(7) | BIT(8));
-	REG_SCFG_EXT = 0x93FFFB06;
+	{
+		REG_SCFG_ROM = 0x101;
+		REG_SCFG_CLK = (BIT(0) | BIT(1) | BIT(2) | BIT(7) | BIT(8));
+		const bool sdAccess = (REG_SCFG_EXT & BIT(18));
+		REG_SCFG_EXT = 0x93FFFB06;
+		if (!sdAccess) {
+			REG_SCFG_EXT &= ~BIT(18);
+		}
+	}
 	*(vu16*)(0x04004012) = 0x1988;
 	*(vu16*)(0x04004014) = 0x264C;
 	*(vu16*)(0x04004C02) = 0x4000;	// enable powerbutton irq (Fix for Unlaunch 1.3)