X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico.c;h=af74dd0faf96668d16ea4a114bae1a5620070f72;hb=e71fae1f13fa9cb16b435c18edb5e1505b18e592;hp=bbc514fec91ae6891b66a711895149fbb4876c63;hpb=a76fad41291b7be0b42554353d6775dcdff065e0;p=picodrive.git

diff --git a/pico/pico.c b/pico/pico.c
index bbc514f..af74dd0 100644
--- a/pico/pico.c
+++ b/pico/pico.c
@@ -169,11 +169,7 @@ int PicoReset(void)
   SekReset();
   // s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).
   SekSetRealTAS(PicoAHW & PAHW_MCD);
-  SekCycleCntT = SekCycleCnt = SekCycleAim = 0;
-
-  if (PicoAHW & PAHW_MCD)
-    // needed for MCD to reset properly, probably some bug hides behind this..
-    memset(Pico.ioports,0,sizeof(Pico.ioports));
+  SekCycleCnt = SekCycleAim = 0;
 
   Pico.m.dirtyPal = 1;
 
@@ -235,19 +231,20 @@ void PicoLoopPrepare(void)
 // same for Outrunners (92-121, when active is set to 24)
 // 96 is VR hack
 static const int dma_timings[] = {
-  96,  167, 166,  83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy
+  167, 167, 166,  83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy
   102, 205, 204, 102, // vblank: 40cell:
   16,   16,  15,   8, // active: 32cell:
   24,   18,  17,   9  // ...
 };
 
 static const int dma_bsycles[] = {
-  (488<<8)/96,  (488<<8)/167, (488<<8)/166, (488<<8)/83,
-  (488<<8)/102, (488<<8)/205, (488<<8)/204, (488<<8)/102,
+  (488<<8)/167, (488<<8)/167, (488<<8)/166, (488<<8)/83,
+  (488<<8)/102, (488<<8)/233, (488<<8)/204, (488<<8)/102,
   (488<<8)/16,  (488<<8)/16,  (488<<8)/15,  (488<<8)/8,
   (488<<8)/24,  (488<<8)/18,  (488<<8)/17,  (488<<8)/9
 };
 
+// grossly inaccurate.. FIXME FIXXXMEE
 PICO_INTERNAL int CheckDMA(void)
 {
   int burn = 0, xfers_can, dma_op = Pico.video.reg[0x17]>>6; // see gens for 00 and 01 modes
@@ -278,23 +275,25 @@ PICO_INTERNAL int CheckDMA(void)
 
 #include "pico_cmn.c"
 
-int z80stopCycle;
-int z80_cycle_cnt;        /* 'done' z80 cycles before z80_run() */
+unsigned int last_z80_sync; /* in 68k cycles */
+int z80_cycle_cnt;
 int z80_cycle_aim;
 int z80_scanline;
 int z80_scanline_cycles;  /* cycles done until z80_scanline */
 
 /* sync z80 to 68k */
-PICO_INTERNAL void PicoSyncZ80(int m68k_cycles_done)
+PICO_INTERNAL void PicoSyncZ80(unsigned int m68k_cycles_done)
 {
   int cnt;
-  z80_cycle_aim = cycles_68k_to_z80(m68k_cycles_done);
+  z80_cycle_aim += cycles_68k_to_z80(m68k_cycles_done - last_z80_sync);
   cnt = z80_cycle_aim - z80_cycle_cnt;
+  last_z80_sync = m68k_cycles_done;
 
   pprof_start(z80);
 
-  elprintf(EL_BUSREQ, "z80 sync %i (%i|%i -> %i|%i)", cnt, z80_cycle_cnt, z80_cycle_cnt / 228,
-    z80_cycle_aim, z80_cycle_aim / 228);
+  elprintf(EL_BUSREQ, "z80 sync %i (%u|%u -> %u|%u)", cnt,
+    z80_cycle_cnt, z80_cycle_cnt / 288,
+    z80_cycle_aim, z80_cycle_aim / 288);
 
   if (cnt > 0)
     z80_cycle_cnt += z80_run(cnt);