Fix NAND save R/W issues

Author: RocketRobz

retail/cardenginei/arm7/source/cardengine.c

@@ -1157,7 +1157,7 @@ static void log_arm9(void) {
 }
 #endif
 
-static bool nandRead(void) {
+static void nandRead(void) {
 	u32 flash = *(vu32*)(sharedAddr+2);
 	u32 memory = *(vu32*)(sharedAddr);
 	u32 len = *(vu32*)(sharedAddr+1);
@@ -1181,11 +1181,13 @@ static bool nandRead(void) {
 
 	//driveInitialize();
 	//cardReadLED(true, true);    // When a file is loading, turn on LED for card read indicator
-	return fileRead((char *)memory, savFile, flash, len);
+	sdmmc_set_ndma_slot(4);
+	fileRead((char *)memory, savFile, flash, len);
+	sdmmc_set_ndma_slot(0);
 	//cardReadLED(false, true);
 }
 
-static bool nandWrite(void) {
+static void nandWrite(void) {
 	u32 flash = *(vu32*)(sharedAddr+2);
 	u32 memory = *(vu32*)(sharedAddr);
 	u32 len = *(vu32*)(sharedAddr+1);
@@ -1210,7 +1212,9 @@ static bool nandWrite(void) {
 	//driveInitialize();
 	saveTimer = 1;			// When we're saving, power button does nothing, in order to prevent corruption.
 	//cardReadLED(true, true);    // When a file is loading, turn on LED for card read indicator
-	return fileWrite((char *)memory, savFile, flash, len);
+	sdmmc_set_ndma_slot(4);
+	fileWrite((char *)memory, savFile, flash, len);
+	sdmmc_set_ndma_slot(0);
 	//cardReadLED(false, true);
 }
 
@@ -1462,17 +1466,17 @@ void runCardEngineCheck(void) {
     			log_arm9();
     			sharedAddr[3] = 0;
                 //IPC_SendSync(0x8);
-    		}
+    		} else
 			#endif
 
 			if (sharedAddr[3] == (vu32)0x025FFC01) {
 				//dmaLed = (sharedAddr[3] == (vu32)0x025FFC01);
-				sharedAddr[3] = nandRead();
-			}
-
-			if (sharedAddr[3] == (vu32)0x025FFC02) {
+				nandRead();
+    			sharedAddr[3] = 0;
+			} else if (sharedAddr[3] == (vu32)0x025FFC02) {
 				//dmaLed = (sharedAddr[3] == (vu32)0x025FFC02);
-				sharedAddr[3] = nandWrite();
+				nandWrite();
+    			sharedAddr[3] = 0;
 			}
 
             /*if (sharedAddr[3] == (vu32)0x025FBC01) {

retail/cardenginei/arm9/source/cardengine.c

@@ -360,7 +360,11 @@ extern void setExceptionHandler2();
 static inline void waitForArm7(void) {
 	// IPC_SendSync(0x4);
 	while (sharedAddr[3] != (vu32)0) {
-		swiDelay(100);
+		#ifdef DLDI
+		swiDelay(50);
+		#else
+		sleepMs(1);
+		#endif
 	}
 }
 
@@ -496,9 +500,7 @@ static inline void cardReadNormal(u8* dst, u32 src, u32 len) {
 				sharedAddr[2] = ((ce9->valueBits & overlaysCached) && src >= newOverlayOffset && src < newOverlayOffset+newOverlaysSize) ? sector+0x80000000 : sector;
 				sharedAddr[3] = commandRead;
 
-				while (sharedAddr[3] == commandRead) {
-					sleepMs(1);
-				}
+				waitForArm7();
 
 				#ifdef ASYNCPF
 				updateDescriptor(slot, sector);
@@ -861,8 +863,10 @@ bool nandRead(void* memory,void* flash,u32 len,u32 dma) {
 		return true; 
 	}
 #endif
+	DC_InvalidateRange(memory, len);
+
 	// Send a command to the ARM7 to read the nand save
-	u32 commandNandRead = 0x025FFC01;
+	const u32 commandNandRead = 0x025FFC01;
 
 	// Write the command
 	sharedAddr[0] = (u32)memory;
@@ -881,8 +885,10 @@ bool nandWrite(void* memory,void* flash,u32 len,u32 dma) {
 		return true;
 	}
 #endif
+	DC_FlushRange(memory, len);
+
 	// Send a command to the ARM7 to write the nand save
-	u32 commandNandWrite = 0x025FFC02;
+	const u32 commandNandWrite = 0x025FFC02;
 
 	// Write the command
 	sharedAddr[0] = (u32)memory;