Try to fix IR breaking after accessing DS Classic Menu

DS-Homebrew · Apr 2, 2020 · e361784 · e361784
1 parent 9c8f8ab
commit e361784
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/quickmenu/arm9/source/main.cpp b/quickmenu/arm9/source/main.cpp
@@ -845,7 +845,7 @@ void refreshNdsCard() {
 
 	if (arm7SCFGLocked && showBoxArt) {
 		loadBoxArt("nitro:/graphics/boxart_unknown.png");
-	} else if ((cardInit() == 0) && showBoxArt) {
+	} else if ((cardInit(true) == 0) && showBoxArt) {
 		char game_TID[5] = {0};
 		tonccpy(&game_TID, ndsCardHeader.gameCode, 4);
 

diff --git a/settings/arm9/source/common/flashcard.cpp b/settings/arm9/source/common/flashcard.cpp
@@ -55,7 +55,7 @@ TWL_CODE void twl_flashcardInit(void) {
 		}
 
 		// Reset Slot-1 to allow reading title name and ID
-		cardInit();
+		cardInit(false);
 
 		//char gamename[13];
 		//char gameid[5];

diff --git a/title/arm9/source/common/flashcard.cpp b/title/arm9/source/common/flashcard.cpp
@@ -55,7 +55,7 @@ TWL_CODE void twl_flashcardInit(void) {
 		}
 
 		// Reset Slot-1 to allow reading title name and ID
-		cardInit();
+		cardInit(false);
 
 		//char gamename[13];
 		//char gameid[5];

diff --git a/universal/include/read_card.h b/universal/include/read_card.h
@@ -39,7 +39,7 @@ extern "C" {
 extern bool cardInited;
 extern sNDSHeaderExt ndsCardHeader;
 
-int cardInit (void);
+int cardInit (bool properReset);
 
 void cardRead (u32 src, void* dest, size_t len);
 

diff --git a/universal/source/read_card.c b/universal/source/read_card.c
@@ -274,7 +274,7 @@ static void switchToTwlBlowfish(void) {
 }
 
 
-int cardInit (void)
+int cardInit (bool properReset)
 {
 	u32 portFlagsKey1, portFlagsSecRead;
 	normalChip = false;	// As defined by GBAtek, normal chip secure area is accessed in blocks of 0x200, other chip in blocks of 0x1000
@@ -293,11 +293,14 @@ int cardInit (void)
 		enableSlot1();
 		for(i = 0; i < 15; i++) { swiWaitForVBlank(); }
 
-		// Dummy command sent after card reset
-		cardParamCommand (CARD_CMD_DUMMY, 0,
-			CARD_ACTIVATE | CARD_nRESET | CARD_CLK_SLOW | CARD_BLK_SIZE(1) | CARD_DELAY1(0x1FFF) | CARD_DELAY2(0x3F),
-			NULL, 0);
-	} else {
+		if (!properReset) {
+			// Dummy command sent after card reset
+			cardParamCommand (CARD_CMD_DUMMY, 0,
+				CARD_ACTIVATE | CARD_nRESET | CARD_CLK_SLOW | CARD_BLK_SIZE(1) | CARD_DELAY1(0x1FFF) | CARD_DELAY2(0x3F),
+				NULL, 0);
+		}
+	}
+	if (!isDSiMode() || properReset) {
 		REG_ROMCTRL=0;
 		REG_AUXSPICNT=0;
 		//ioDelay2(167550);