bugfixes, new scaling, double ym upd at 940

[picodrive.git] / Pico / Pico.c

diff --git a/Pico/Pico.c b/Pico/Pico.c
index 4847f55..d0845e1 100644 (file)
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -72,7 +72,7 @@ int PicoReset(int hard)
   PicoMemReset();\r
   SekReset();\r
   // s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).\r
-  CycloneSetRealTAS(PicoMCD & 1);\r
+  SekSetRealTAS(PicoMCD & 1);\r
   SekCycleCntT=0;\r
   z80_reset();\r
 \r
@@ -486,7 +486,13 @@ static int PicoFrameSimple(void)
   int y=0,line=0,lines=0,lines_step=0,sects;\r
   int cycles_68k_vblock,cycles_68k_block;\r
 \r
-  if(Pico.m.pal) {\r
+  // we don't emulate DMA timing in this mode\r
+  if (Pico.m.dma_bytes) {\r
+    Pico.m.dma_bytes=0;\r
+    Pico.video.status&=~2;\r
+  }\r
+\r
+  if (Pico.m.pal) {\r
     // M68k cycles/frame: 152009.78\r
     if(pv->reg[1]&8) { // 240 lines\r
       cycles_68k_block  = (int) ((double) OSC_PAL  /  7 / 50 / 312 * 15 + 0.4); // 16 sects, 16*15=240, 7308\r