fix possible freeze during cart transfer (Dragon Ball 2)

Author: Arisotura

src/DMA.cpp

@@ -145,6 +145,8 @@ void DMA::WriteCnt(u32 val)
 
         if ((StartMode & 0x7) == 0)
             Start();
+        else if (StartMode == 0x05 || StartMode == 0x12)
+            NDS.NDSCartSlots[0]->CheckDMA(CPU);
         else if (StartMode == 0x07)
             NDS.GPU.GPU3D.CheckFIFODMA();
 
@@ -621,6 +623,9 @@ void DMA::Run9()
     Running = 0;
     InProgress = false;
     NDS.ResumeCPU(0, 1<<Num);
+
+    if (StartMode == 0x05)
+        NDS.NDSCartSlots[0]->CheckDMA(0);
 }
 
 void DMA::Run7()
@@ -691,6 +696,9 @@ void DMA::Run7()
     Running = 0;
     InProgress = false;
     NDS.ResumeCPU(1, 1<<Num);
+
+    if (StartMode == 0x12)
+        NDS.NDSCartSlots[0]->CheckDMA(1);
 }
 
 void DMA::Run()

src/DSi_NDMA.cpp

@@ -127,6 +127,10 @@ void DSi_NDMA::WriteCnt(u32 val)
 
         if ((StartMode & 0x1F) == 0x10)
             Start();
+        else if (StartMode == 0x04 || StartMode == 0x24)
+            DSi.NDSCartSlots[0]->CheckDMA(CPU);
+        else if (StartMode == 0x05 || StartMode == 0x25)
+            DSi.NDSCartSlots[1]->CheckDMA(CPU);
         else if (StartMode == 0x0A)
             DSi.GPU.GPU3D.CheckFIFODMA();
 
@@ -290,6 +294,11 @@ void DSi_NDMA::Run9()
     Running = 0;
     InProgress = false;
     DSi.ResumeCPU(0, 1<<(Num+4));
+
+    if (StartMode == 0x04)
+        DSi.NDSCartSlots[0]->CheckDMA(0);
+    else if (StartMode == 0x05)
+        DSi.NDSCartSlots[1]->CheckDMA(0);
 }
 
 void DSi_NDMA::Run7()
@@ -389,6 +398,11 @@ void DSi_NDMA::Run7()
 
     DSi.AES.CheckInputDMA();
     DSi.AES.CheckOutputDMA();
+
+    if (StartMode == 0x24)
+        DSi.NDSCartSlots[0]->CheckDMA(1);
+    else if (StartMode == 0x25)
+        DSi.NDSCartSlots[1]->CheckDMA(1);
 }
 
 }

src/NDS.cpp

@@ -1933,8 +1933,8 @@ void NDS::debug(u32 param)
 
     //for (int i = 0; i < 9; i++)
     //    printf("VRAM %c: %02X\n", 'A'+i, GPU->VRAMCNT[i]);
-
-    /*Platform::FileHandle* shit = Platform::OpenFile("debug/pokeplat.bin", FileMode::Write);
+return;
+    Platform::FileHandle* shit = Platform::OpenFile("debug/dragonball.bin", FileMode::Write);
     Platform::FileWrite(ARM9.ITCM, 0x8000, 1, shit);
     for (u32 i = 0x02000000; i < 0x02400000; i+=4)
     {
@@ -1951,9 +1951,9 @@ void NDS::debug(u32 param)
         u32 val = NDS::ARM7Read32(i);
         Platform::FileWrite(&val, 4, 1, shit);
     }
-    Platform::CloseFile(shit);*/
+    Platform::CloseFile(shit);
 
-    FILE*
+    /*FILE*
     shit = fopen("debug/bowser9.bin", "wb");
     fwrite(ARM9.ITCM, 0x8000, 1, shit);
     for (u32 i = 0x02000000; i < 0x04000000; i+=4)
@@ -1968,7 +1968,7 @@ void NDS::debug(u32 param)
         u32 val = ARM7Read32(i);
         fwrite(&val, 4, 1, shit);
     }
-    fclose(shit);
+    fclose(shit);*/
 }
 
 

src/NDSCart.cpp

@@ -959,8 +959,17 @@ void NDSCartSlot::Interface::RaiseDRQ()
     // TODO: the DMA trigger is level-sensitive
     // thus, if a cart DMA gets set up while DRQ is already active, it will start immediately
     // emulating this would require keeping track of the DMA trigger line states somewhere
+    // the current handling for this is a hack
+    // (DMA triggering needs a cleanup anyway)
 
     ROMCnt |= (1<<23);
+    CheckDMA();
+}
+
+void NDSCartSlot::Interface::CheckDMA()
+{
+    if (!(ROMCnt & (1<<23)))
+        return;
 
     // TODO: make this code suck less!!
     // maybe have a general "DMA trigger function" that covers both DMA types for DSi

src/NDSCart.h

@@ -138,6 +138,8 @@ class NDSCartSlot
     u32 ReadROMData(u32 cpu) noexcept { return Interfaces[cpu].ReadROMData(); }
     void WriteROMData(u32 cpu, u32 val, u32 mask) noexcept { Interfaces[cpu].WriteROMData(val, mask); }
 
+    void CheckDMA(u32 cpu) { return Interfaces[cpu].CheckDMA(); }
+
     void RaiseCardIRQ();
 
 private:
@@ -177,6 +179,7 @@ class NDSCartSlot
         void ROMAdvanceSend();
         void ROMEndTransfer(u32 param);
         void RaiseDRQ();
+        void CheckDMA();
 
         void SPITransferDone(u32 param);
 

src/frontend/qt_sdl/Window.cpp

@@ -964,7 +964,7 @@ void MainWindow::keyPressEvent(QKeyEvent* event)
     if (event->isAutoRepeat()) return;
 
     // TODO!! REMOVE ME IN RELEASE BUILDS!!
-    //if (event->key() == Qt::Key_F11) emuInstance->getNDS()->debug(0);
+    if (event->key() == Qt::Key_F11) emuInstance->getNDS()->debug(0);
 
     emuInstance->onKeyPress(event);
 }