slot1launch: Improve Slot-1 reset

Ported from Lorenzooone/Simple-DS-Slot-1-Launcher@a9386b6

Author: RocketRobz

slot1launch/arm7/source/main.c

@@ -20,13 +20,8 @@
 #include <nds/arm7/input.h>
 #include <nds/system.h>
 
-#include "resetslot.h"
-
-void VcountHandler() {
-	inputGetAndSend();
-}
-
 void VblankHandler(void) {
+	inputGetAndSend();
 }
 
 int main(void) {
@@ -39,26 +34,14 @@ int main(void) {
 	initClockIRQ();
 	fifoInit();
 
-	SetYtrigger(80);
-
 	installSystemFIFO();
 
-	irqSet(IRQ_VCOUNT, VcountHandler);
 	irqSet(IRQ_VBLANK, VblankHandler);
-
-	irqEnable( IRQ_VBLANK | IRQ_VCOUNT);
+	irqEnable(IRQ_VBLANK);
 
 	if (isDSiMode()) {
 		i2cWriteRegister(0x4A, 0x12, 0x00);		// Press power-button for auto-reset
 		i2cWriteRegister(0x4A, 0x70, 0x01);		// Bootflag = Warmboot/SkipHealthSafety
-
-		// Make sure Arm9 had a chance to check slot status
-		fifoWaitValue32(FIFO_USER_01);
-		// If Arm9 reported slot is powered off, have Arm7 wait for Arm9 to be ready before card reset. This makes sure arm7 doesn't try card reset too early.
-		if (fifoCheckValue32(FIFO_USER_02)) { 
-			if (fifoCheckValue32(FIFO_USER_07)) { TWL_ResetSlot1(); } else { PowerOnSlot(); }
-		}
-		fifoSendValue32(FIFO_USER_03, 1);
 	}
 
 	while (1) {

slot1launch/arm7/source/resetslot.c

@@ -84,6 +84,22 @@ off_t getFileSize(const char *fileName)
 	return fsize;
 }
 
+static void cart_reset() {
+	if(isDSiMode()) {
+		disableSlot1();
+		for(int i = 0; i < 20; i++)
+			swiWaitForVBlank();
+		enableSlot1();
+		while(REG_ROMCTRL & CARD_BUSY)
+			swiWaitForVBlank();
+		for(int i = 0; i < 2; i++)
+			swiWaitForVBlank();
+		REG_ROMCTRL = CARD_nRESET;
+		for(int i = 0; i < 15; i++)
+			swiWaitForVBlank();
+	}
+}
+
 
 bool consoleOn = false;
 
@@ -105,16 +121,8 @@ int main() {
 			runCardEngine = settingsini.GetInt("SRLOADER","SLOT1_CARDENGINE",1);
 			EnableSD = settingsini.GetInt("SRLOADER","SLOT1_ENABLESD",0);
 
-			// Tell Arm7 it's ready for card reset (if card reset is nessecery)
-			fifoSendValue32(FIFO_USER_01, 1);
-			// Waits for Arm7 to finish card reset (if nessecery)
-			fifoWaitValue32(FIFO_USER_03);
-
-			// Wait for card to stablize before continuing
-			for (int i = 0; i < 30; i++) { swiWaitForVBlank(); }
-
 			sysSetCardOwner (BUS_OWNER_ARM9);
-
+			cart_reset();
 			cardReadHeader((uint8*)&ndsHeader);
 
 			char gameTid[5];
@@ -171,19 +179,8 @@ int main() {
 			}
 
 		} else {
-			//fifoSendValue32(FIFO_USER_02, 1);
-			//fifoSendValue32(FIFO_USER_07, 1);
-
-			// Tell Arm7 it's ready for card reset (if card reset is nessecery)
-			fifoSendValue32(FIFO_USER_01, 1);
-			// Waits for Arm7 to finish card reset (if nessecery)
-			fifoWaitValue32(FIFO_USER_03);
-
-			// Wait for card to stablize before continuing
-			for (int i = 0; i < 30; i++) { swiWaitForVBlank(); }
-
 			sysSetCardOwner (BUS_OWNER_ARM9);
-
+			cart_reset();
 			cardReadHeader((uint8*)&ndsHeader);
 		}