X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_cmn.c;h=341255a8139fd7c7018b82d2b3cf0f797f22e12f;hb=bc38f4d24fcdbbefbda10ef023c0ffbab4b208b8;hp=5ce13aaeaadd7339e96d38fc85d5314d746cf52e;hpb=53f948c9014404685aaacce497755794c25bc5b6;p=picodrive.git

diff --git a/pico/pico_cmn.c b/pico/pico_cmn.c
index 5ce13aa..341255a 100644
--- a/pico/pico_cmn.c
+++ b/pico/pico_cmn.c
@@ -39,7 +39,7 @@ static void SekSyncM68k(void)
 #elif defined(EMU_M68K)
     SekCycleCnt += m68k_execute(cyc_do) - cyc_do;
 #elif defined(EMU_F68K)
-    SekCycleCnt += fm68k_emulate(cyc_do, 0, 0) - cyc_do;
+    SekCycleCnt += fm68k_emulate(cyc_do, 0) - cyc_do;
 #endif
   }
 
@@ -148,7 +148,8 @@ static int PicoFrameHints(void)
       if (ym2612.dacen && PsndDacLine <= y)
         PsndDoDAC(y);
 #ifdef PICO_CD
-      pcd_sync_s68k(cycles, 0);
+      if (PicoAHW & PAHW_MCD)
+        pcd_sync_s68k(cycles, 0);
 #endif
 #ifdef PICO_32X
       p32x_sync_sh2s(cycles);
@@ -203,6 +204,7 @@ static int PicoFrameHints(void)
   // also delay between F bit (bit 7) is set in SR and IRQ happens (Ex-Mutants)
   // also delay between last H-int and V-int (Golden Axe 3)
   line_base_cycles = SekCyclesDone();
+  if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
   CPUS_RUN(CYCLES_M68K_VINT_LAG);
 
   if (pv->reg[1]&0x20) {
@@ -218,7 +220,8 @@ static int PicoFrameHints(void)
   }
 
 #ifdef PICO_CD
-  pcd_sync_s68k(cycles, 0);
+  if (PicoAHW & PAHW_MCD)
+    pcd_sync_s68k(cycles, 0);
 #endif
 #ifdef PICO_32X
   p32x_sync_sh2s(cycles);
@@ -234,7 +237,6 @@ static int PicoFrameHints(void)
   }
 
   // Run scanline:
-  if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
   CPUS_RUN(CYCLES_M68K_LINE - CYCLES_M68K_VINT_LAG - CYCLES_M68K_ASD);
 
   if (PicoLineHook) PicoLineHook();
@@ -271,7 +273,8 @@ static int PicoFrameHints(void)
     PsndDoDAC(lines-1);
 
 #ifdef PICO_CD
-  pcd_sync_s68k(cycles, 0);
+  if (PicoAHW & PAHW_MCD)
+    pcd_sync_s68k(cycles, 0);
 #endif
 #ifdef PICO_32X
   p32x_sync_sh2s(cycles);