X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_cmn.c;h=70d7807a913fda7ec9ee41ede96accddc403e822;hb=d01fa2044c98b23dfb72188a7486e567ab2d3dda;hp=e2ec0e1ab057d537d8e3cc1e37bf481b991c24d1;hpb=a4dfdb6de1d63aed997554c347cd36cc33b134a3;p=picodrive.git

diff --git a/pico/pico_cmn.c b/pico/pico_cmn.c
index e2ec0e1..70d7807 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
   }
 
@@ -50,7 +50,7 @@ static void SekSyncM68k(void)
   pprof_end(m68k);
 }
 
-static inline void SekRunM68k(int cyc)
+static INLINE void SekRunM68k(int cyc)
 {
   SekCycleAim += cyc;
   SekSyncM68k();
@@ -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);
@@ -167,7 +168,7 @@ static int PicoFrameHints(void)
 
   if (!skip)
   {
-    if (DrawScanline < y)
+    if (Pico.est.DrawScanline < y)
       PicoDrawSync(y - 1, 0);
 #ifdef DRAW_FINISH_FUNC
     DRAW_FINISH_FUNC();
@@ -219,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);
@@ -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);