[backport] If the DMA transfer isn't done, wait

Backport of 7515637 from nightly-v4 branch
ChainSwordCS · Oct 14, 2023 · fae2a9d · fae2a9d
1 parent 77367f6
commit fae2a9d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/ChirunoMod.cia b/ChirunoMod.cia
diff --git a/ChirunoMod_nodebug.cia b/ChirunoMod_nodebug.cia
diff --git a/ChirunoMod_verbosedebug.cia b/ChirunoMod_verbosedebug.cia
diff --git a/soos/main.cpp b/soos/main.cpp
@@ -1580,7 +1580,22 @@ void netfuncOld3DS(void* __dummy_arg__)
             for(int loopy = 1; loopy > 0; loopy--)
             {
                 //soc->setPakSize(0);
-            	tryStopDma();
+
+                int dmaState = 0;
+                for(int i = 0; i < 60; i++)
+                {
+                    svcGetDmaState(&dmaState, dmahand);
+                    if(dmaState == 4 || dmaState == 0)
+                        break;
+                    svcSleepThread(5e4);
+                }
+
+                tryStopDma();
+
+#if DEBUG_BASIC==1
+                if(dmaState != 4 && dmaState != 0)
+                    printf("DMA transfer not finished, stopping manually...\ndmaState=%i\n", dmaState);
+#endif
 
                 int imgsize = 0;
 
@@ -1783,8 +1798,23 @@ void netfuncNew3DS(void* __dummy_arg__)
             for(int loopy = 1; loopy > 0; loopy--)
             {
                 //soc->setPakSize(0);
+
+                int dmaState = 0;
+                for(int i = 0; i < 60; i++)
+                {
+                    svcGetDmaState(&dmaState, dmahand);
+                    if(dmaState == 4 || dmaState == 0)
+                        break;
+                    svcSleepThread(5e4);
+                }
+
             	tryStopDma();
 
+#if DEBUG_BASIC==1
+            	if(dmaState != 4 && dmaState != 0)
+            	    printf("DMA transfer not finished, stopping manually...\ndmaState=%i\n", dmaState);
+#endif
+
             	//New3DS-Specific
             	svcFlushProcessDataCache(0xFFFF8001, (u8*)screenbuf, capin.screencapture[scr].framebuf_widthbytesize * 400);