Revert "Remove Slot-1 Touch Mode setting"

This reverts commit 3a268b3.
DS-Homebrew · Oct 3, 2024 · c3aa10b · c3aa10b
1 parent a259848
commit c3aa10b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/settings/arm9/source/main.cpp b/settings/arm9/source/main.cpp
@@ -1452,6 +1452,7 @@ int settingsMode(void)
 			miscPage
 				.option(STR_SLOT1SCFGUNLOCK, STR_DESCRIPTION_SLOT1SCFGUNLOCK, Option::Bool(&ms().slot1SCFGUnlock), {STR_ON, STR_OFF}, {true, false})
 				.option(STR_SLOT1SDACCESS, STR_DESCRIPTION_SLOT1SDACCESS, Option::Bool(&ms().slot1AccessSD), {STR_ON, STR_OFF}, {true, false})
+				.option(STR_SLOT1TOUCHMODE, STR_DESCRIPTION_SLOT1TOUCHMODE, Option::Bool(&ms().slot1TouchMode), {STR_DSI_MODE, STR_DS_MODE}, {true, false})
 				.option(STR_S1SDACCESS, STR_DESCRIPTION_S1SDACCESS_1, Option::Bool(&ms().secondaryAccess), {STR_ON, STR_OFF}, {true, false});
 		}
 

diff --git a/slot1launch/arm9/source/main.cpp b/slot1launch/arm9/source/main.cpp
@@ -99,7 +99,7 @@ int main() {
 			CIniFile settingsini("/_nds/TWiLightMenu/settings.ini");
 
 			ignoreBlacklists = settingsini.GetInt("SRLOADER","IGNORE_BLACKLISTS",false);
-			// TWLTOUCH = settingsini.GetInt("SRLOADER","SLOT1_TOUCH_MODE",0);
+			TWLTOUCH = settingsini.GetInt("SRLOADER","SLOT1_TOUCH_MODE",0);
 			soundFreq = settingsini.GetInt("NDS-BOOTSTRAP","SOUND_FREQ",0);
 			sleepMode = settingsini.GetInt("SRLOADER","SLEEP_MODE",1);
 			runCardEngine = settingsini.GetInt("SRLOADER","SLOT1_CARDENGINE",1);

diff --git a/slot1launch/bootloader/source/main.arm7.c b/slot1launch/bootloader/source/main.arm7.c
@@ -657,7 +657,7 @@ static void NDSTouchscreenMode(void) {
 	writePowerManagement(PM_CONTROL_REG, 0x0D); //*(unsigned char*)0x40001C2 = 0x00, 0x0D; // PWR[0]=0Dh    ;<-- also part of TSC !
 }
 
-/* static void DSiTouchscreenMode(void) {
+static void DSiTouchscreenMode(void) {
 	if (strncmp((const char*)0x04FFFA00, "no$gba", 6) != 0) {
 		return;
 	}
@@ -721,7 +721,7 @@ static void NDSTouchscreenMode(void) {
 	// Finish up!
 	cdcReadReg (CDC_TOUCHCNT, 0x02);
 	cdcWriteReg(CDC_TOUCHCNT, 0x02, 0x00);
-} */
+}
 
 // SDK 5
 static bool ROMsupportsDsiMode(const tNDSHeader* ndsHeader) {
@@ -1030,13 +1030,13 @@ void arm7_main (void) {
 			*(u32*)0x3FFFFC8 = 0x7884;	// Fix sound pitch table for DSi mode (works with SDK5 binaries)
 
 			if (ndsHeader->unitCode == 0 || (ndsHeader->unitCode > 0 && !(*(u8*)0x02FFE1BF & BIT(0)))) {
-				NDSTouchscreenMode();
+				twlTouch ? DSiTouchscreenMode() : NDSTouchscreenMode();
 				*(vu16*)0x4000500 = 0x807F;
 			}
 		} else {
 			REG_SCFG_ROM = 0x703;
 
-			NDSTouchscreenMode();
+			twlTouch ? DSiTouchscreenMode() : NDSTouchscreenMode();
 			*(vu16*)0x4000500 = 0x807F;
 
 			REG_GPIO_WIFI |= BIT(8);	// Old NDS-Wifi mode

diff --git a/slot1launch/bootloaderAlt/source/main.arm7.c b/slot1launch/bootloaderAlt/source/main.arm7.c
@@ -479,7 +479,7 @@ static void NDSTouchscreenMode(void) {
 	writePowerManagement(PM_CONTROL_REG, 0x0D); //*(unsigned char*)0x40001C2 = 0x00, 0x0D; // PWR[0]=0Dh    ;<-- also part of TSC !
 }
 
-/* static void DSiTouchscreenMode(void) {
+static void DSiTouchscreenMode(void) {
 	if (strncmp((const char*)0x04FFFA00, "no$gba", 6) != 0) {
 		return;
 	}
@@ -543,7 +543,7 @@ static void NDSTouchscreenMode(void) {
 	// Finish up!
 	cdcReadReg (CDC_TOUCHCNT, 0x02);
 	cdcWriteReg(CDC_TOUCHCNT, 0x02, 0x00);
-} */
+}
 
 int arm7_loadBinary (void) {
 	u32 chipID;
@@ -733,7 +733,7 @@ void arm7_main (void) {
 			}
 		}
 
-		NDSTouchscreenMode();
+		twlTouch ? DSiTouchscreenMode() : NDSTouchscreenMode();
 		*(vu16*)0x4000500 = 0x807F;
 
 		REG_GPIO_WIFI |= BIT(8);	// Old NDS-Wifi mode

diff --git a/universal/include/common/twlmenusettings.h b/universal/include/common/twlmenusettings.h
@@ -348,6 +348,7 @@ class TWLSettings
 
 	bool slot1AccessSD;
 	bool slot1SCFGUnlock;
+	bool slot1TouchMode;
 	bool ezFlashRam;
 	int limitedMode;
 	bool dontShowDSiWareInDSModeWarning;

diff --git a/universal/source/common/twlmenusettings.cpp b/universal/source/common/twlmenusettings.cpp
@@ -110,6 +110,7 @@ TWLSettings::TWLSettings()
 
 	slot1AccessSD = false;
 	slot1SCFGUnlock = false;
+	slot1TouchMode = false;
 	ezFlashRam = false;
 	limitedMode = 0;
 	dontShowDSiWareInDSModeWarning = false;
@@ -307,6 +308,7 @@ void TWLSettings::loadSettings()
 
 	slot1AccessSD = settingsini.GetInt("SRLOADER", "SLOT1_ENABLESD", slot1AccessSD);
 	slot1SCFGUnlock = settingsini.GetInt("SRLOADER", "SLOT1_SCFG_UNLOCK", slot1SCFGUnlock);
+	slot1TouchMode = settingsini.GetInt("SRLOADER", "SLOT1_TOUCH_MODE", slot1TouchMode);
 	ezFlashRam = settingsini.GetInt("SRLOADER", "EZ_FLASH_RAM", ezFlashRam);
 	limitedMode = settingsini.GetInt("SRLOADER", "LIMITED_MODE", limitedMode);
 	dontShowDSiWareInDSModeWarning = settingsini.GetInt("SRLOADER", "DONT_SHOW_DSIWARE_IN_DS_MODE_WARNING", dontShowDSiWareInDSModeWarning);
@@ -472,6 +474,7 @@ void TWLSettings::saveSettings()
 
 	settingsini.SetInt("SRLOADER", "SLOT1_ENABLESD", slot1AccessSD);
 	settingsini.SetInt("SRLOADER", "SLOT1_SCFG_UNLOCK", slot1SCFGUnlock);
+	settingsini.SetInt("SRLOADER", "SLOT1_TOUCH_MODE", slot1TouchMode);
 	settingsini.SetInt("SRLOADER", "LIMITED_MODE", limitedMode);
 	settingsini.SetInt("SRLOADER", "DONT_SHOW_DSIWARE_IN_DS_MODE_WARNING", dontShowDSiWareInDSModeWarning);
 	settingsini.SetInt("SRLOADER", "DSIWARE_BOOTER", dsiWareBooter);