new acc mode timing, VDP FIFO code

[picodrive.git] / Pico / cd / Pico.c

diff --git a/Pico/cd/Pico.c b/Pico/cd/Pico.c
index 5dcb39c..ab0c333 100644 (file)
--- a/Pico/cd/Pico.c
+++ b/Pico/cd/Pico.c
@@ -122,7 +122,7 @@ void SekRunPS(int cyc_m68k, int cyc_s68k);
 static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
 {
   int cycn, cycn_s68k, cyc_do;
-  int d_cm = 0, d_cs = 0, ex;
+  int ex;
   SekCycleAim+=cyc_m68k;
   SekCycleAimS68k+=cyc_s68k;
 
@@ -134,7 +134,6 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
   {
     ex = 0;
     cycn_s68k = (cycn + cycn/2 + cycn/8) >> 16;
-//fprintf(stderr, "%3i/%3i:  ", cycn>>16, cycn_s68k);
     if ((cyc_do = SekCycleAim-SekCycleCnt-(cycn>>16)) > 0) {
 #if defined(EMU_C68K)
       PicoCpu.cycles = cyc_do;
@@ -145,7 +144,6 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
       SekCycleCnt += (ex = m68k_execute(cyc_do));
 #endif
     }
-//fprintf(stderr, "%3i ", ex); d_cm += ex; ex = 0;
     if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) {
 #if defined(EMU_C68K)
       PicoCpuS68k.cycles = cyc_do;
@@ -156,10 +154,7 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
       SekCycleCntS68k += (ex = m68k_execute(cyc_do));
 #endif
     }
-//fprintf(stderr, "%3i\n", ex); d_cs += ex;
   }
-
-//fprintf(stderr, "==    end %3i/%3i    ==\n", d_cm, d_cs);
 }
 #endif
 
@@ -199,7 +194,7 @@ static __inline void update_chips(void)
                Pico_mcd->m.timer_int3 -= counter_timer;
                if (Pico_mcd->m.timer_int3 < 0) {
                        if (Pico_mcd->s68k_regs[0x33] & (1<<3)) {
-                               dprintf("s68k: timer irq 3");
+                               elprintf(EL_INTS, "s68k: timer irq 3");
                                SekInterruptS68k(3);
                                Pico_mcd->m.timer_int3 += int3_set << 16;
                        }
@@ -324,7 +319,7 @@ static int PicoFrameHintsMCD(void)
 
     // Run scanline:
       //dprintf("m68k starting exec @ %06x", SekPc);
-    if (Pico.m.dma_bytes) SekCycleCnt+=CheckDMA();
+    if (Pico.m.dma_xfers) SekCycleCnt+=CheckDMA();
     if ((PicoOpt & 0x2000) && (Pico_mcd->m.busreq&3) == 1) {
       SekRunPS(cycles_68k, cycles_s68k); // "better/perfect sync"
     } else {