Comment unneeded code

Author: RocketRobz

retail/cardenginei/arm7/source/cardengine.c

@@ -1241,7 +1241,7 @@ static bool nandWrite(void) {
 	cardReadLED(false);
 }*/
 
-static bool readOngoing = false;
+//static bool readOngoing = false;
 //static bool sdReadOngoing = false;
 static bool ongoingIsDma = false;
 //static int currentCmd=0, currentNdmaSlot=0;
@@ -1439,11 +1439,11 @@ void runCardEngineCheck(void) {
 
 						const bool isDma = (/* sharedAddr[3] == (vu32)0x020FF80A || */ sharedAddr[3] == (vu32)0x025FFB0A);
 
-						readOngoing = true;
+						// readOngoing = true;
 						cardReadLED(true, isDma);    // When a file is loading, turn on LED for card read indicator
 						fileRead((char*)dst, useApFixOverlays ? apFixOverlaysFile : romFile, src, len);
 						cardReadLED(false, isDma);    // After loading is done, turn off LED for card read indicator
-						readOngoing = false;
+						// readOngoing = false;
 						sharedAddr[3] = 0;
 					if (isDma) {
 						IPC_SendSync(0x3);
@@ -1909,7 +1909,7 @@ bool eepromRead(u32 src, void *dst, u32 len) {
 	}
 
 	if (tryLockMutex(&saveMutex)) {
-		while (readOngoing) { swiDelay(100); }
+		// while (readOngoing) { swiDelay(100); }
 		#ifdef TWLSDK
 		//bool doBak = ((valueBits & gameOnFlashcard) && !(valueBits & saveOnFlashcard));
 		//if (doBak) bakSdData();
@@ -1958,7 +1958,7 @@ bool eepromPageWrite(u32 dst, const void *src, u32 len) {
 	}
 
 	if (tryLockMutex(&saveMutex)) {
-		while (readOngoing) { swiDelay(100); }
+		// while (readOngoing) { swiDelay(100); }
 		#ifdef TWLSDK
 		//bool doBak = ((valueBits & gameOnFlashcard) && !(valueBits & saveOnFlashcard));
 		//if (doBak) bakSdData();
@@ -2008,7 +2008,7 @@ bool eepromPageProg(u32 dst, const void *src, u32 len) {
 	}
 
  	if (tryLockMutex(&saveMutex)) {
-		while (readOngoing) { swiDelay(100); }
+		// while (readOngoing) { swiDelay(100); }
 		#ifdef TWLSDK
 		//bool doBak = ((valueBits & gameOnFlashcard) && !(valueBits & saveOnFlashcard));
 		//if (doBak) bakSdData();
@@ -2167,7 +2167,7 @@ bool cardRead(u32 dma, u32 src, void *dst, u32 len) {
 	if (valueBits & ROMinRAM) {
 		cardReadRAM(dst, src, len);
 	} else {
-		while (readOngoing) { swiDelay(100); }
+		// while (readOngoing) { swiDelay(100); }
 		//driveInitialize();
 		cardReadLED(true, false);    // When a file is loading, turn on LED for card read indicator
 		//ndmaUsed = false;

retail/cardenginei/arm9/source/cardDma.thumb.c

@@ -393,7 +393,7 @@ void cardSetDma(u32 * params) {
 
 	enableIPC_SYNC();
 
-	u32 commandRead=0x025FFB0A;
+	const u32 commandRead=0x025FFB0A;
 	u32 sector = (src/ce9->cacheBlockSize)*ce9->cacheBlockSize;
 	//u32 page = (src / 512) * 512;
 
@@ -412,7 +412,7 @@ void cardSetDma(u32 * params) {
 
 		dmaReadOnArm7 = true;
 
-		IPC_SendSync(0x4);
+		// IPC_SendSync(0x4);
 	} else { */
 		// Read via the main RAM cache
 		int slot = getSlotForSector(sector);

retail/cardenginei/arm9/source/cardengine.c

@@ -423,7 +423,7 @@ static u32 newOverlaysSize = 0;
 
 static inline void cardReadNormal(u8* dst, u32 src, u32 len) {
 #ifdef DLDI
-	while (sharedAddr[3]==0x444D4152);	// Wait during a RAM dump
+	// while (sharedAddr[3]==0x444D4152);	// Wait during a RAM dump
 	fileRead((char*)dst, ((ce9->valueBits & overlaysCached) && src >= ce9->overlaysSrc && src < ndsHeader->arm7romOffset) ? apFixOverlaysFile : romFile, src, len);
 #else
 	if (newOverlayOffset == 0) {
@@ -433,6 +433,7 @@ static inline void cardReadNormal(u8* dst, u32 src, u32 len) {
 		}
 	}
 
+	const u32 commandRead = (isDma ? 0x025FFB0A : 0x025FFB08);
 	u32 sector = (src/ce9->cacheBlockSize)*ce9->cacheBlockSize;
 
 	accessCounter++;
@@ -446,7 +447,18 @@ static inline void cardReadNormal(u8* dst, u32 src, u32 len) {
 	//}
 
 	/* if ((ce9->valueBits & cacheDisabled) && (u32)dst >= 0x02000000 && (u32)dst < 0x03000000) {
-		fileRead((char*)dst, ((ce9->valueBits & overlaysCached) && src >= newOverlayOffset && src < newOverlayOffset+newOverlaysSize) ? apFixOverlaysFile : romFile, src, len);
+		DC_InvalidateRange((u32*)dst, len);
+
+		// Write the command
+		sharedAddr[0] = (vu32)dst;
+		sharedAddr[1] = len;
+		sharedAddr[2] = ((ce9->valueBits & overlaysCached) && src >= ce9->overlaysSrc && src < ndsHeader->arm7romOffset) ? src+0x80000000 : src;
+		sharedAddr[3] = commandRead;
+
+		while (sharedAddr[3] == commandRead) {
+			sleepMs(1);
+		}
+		// fileRead((char*)dst, ((ce9->valueBits & overlaysCached) && src >= newOverlayOffset && src < newOverlayOffset+newOverlaysSize) ? apFixOverlaysFile : romFile, src, len);
 	} else { */
 		// Read via the main RAM cache
 		//bool runSleep = true;
@@ -478,8 +490,6 @@ static inline void cardReadNormal(u8* dst, u32 src, u32 len) {
 
 				DC_InvalidateRange((u32*)buffer, ce9->cacheBlockSize);
 
-				const u32 commandRead = (isDma ? 0x025FFB0A : 0x025FFB08);
-
 				// Write the command
 				sharedAddr[0] = (vu32)buffer;
 				sharedAddr[1] = ce9->cacheBlockSize;