bugfixes, adjusted famec timing

[picodrive.git] / Pico / VideoPort.c

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index ffbda06..5840bc7 100644 (file)
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -129,7 +129,7 @@ static void DmaSlow(int len)
       pd=(u16 *)(prg_ram+(source&0x1fffe));\r
       pdend=(u16 *)(prg_ram+0x20000);\r
     } else {\r
-      elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow FIXME: unsupported src");\r
+      elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow[%i] %06x->%04x: FIXME: unsupported src", Pico.video.type, source, a);\r
       return;\r
     }\r
   } else {\r
@@ -137,7 +137,7 @@ static void DmaSlow(int len)
       pd=(u16 *)(Pico.rom+(source&~1));\r
       pdend=(u16 *)(Pico.rom+Pico.romsize);\r
     } else {\r
-      elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow: invalid dma src");\r
+      elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow[%i] %06x->%04x: invalid src", Pico.video.type, source, a);\r
       return;\r
     }\r
   }\r
@@ -374,29 +374,24 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
         //if(num==01) dprintf("set_blank: %i @ %06x [%i|%i]", !((d&0x40)>>6), SekPc, Pico.m.scanline, SekCyclesDone());\r
         //if(num==10) dprintf("hint_set: %i @ %06x [%i|%i]", (unsigned char)d, SekPc, Pico.m.scanline, SekCyclesDone());\r
         pvid->reg[num]=(unsigned char)d;\r
-#if !(defined(EMU_C68K) && defined(EMU_M68K)) // not debugging Cyclone\r
+#ifndef EMU_CORE_DEBUG\r
         // update IRQ level (Lemmings, Wiz 'n' Liz intro, ... )\r
         // may break if done improperly:\r
         // International Superstar Soccer Deluxe (crash), Street Racer (logos), Burning Force (gfx),\r
-        // Fatal Rewind (hang), Sesame Street Counting Cafe\r
-        if(num < 2) {\r
-#ifdef EMU_C68K\r
-          // hack: make sure we do not touch the irq line if Cyclone is just about to take the IRQ\r
-          if (PicoCpuCM68k.irq <= (PicoCpuCM68k.srh&7)) {\r
-#endif\r
-            int lines, pints;\r
+        // Fatal Rewind (crash), Sesame Street Counting Cafe\r
+        if (num < 2)\r
+        {\r
+          if (!SekShouldInterrupt) // hack\r
+          {\r
+            int lines, pints, irq=0;\r
             lines = (pvid->reg[1] & 0x20) | (pvid->reg[0] & 0x10);\r
             pints = (pvid->pending_ints&lines);\r
-                 if(pints & 0x20) SekInterrupt(6);\r
-            else if(pints & 0x10) SekInterrupt(4);\r
-            else SekInterrupt(0);\r
-#ifdef EMU_C68K\r
-            // adjust cycles for Cyclone so it would take the int "in time"\r
-            if(PicoCpuCM68k.irq) {\r
-              SekEndRun(24);\r
-            }\r
+                 if(pints & 0x20) irq = 6;\r
+            else if(pints & 0x10) irq = 4;\r
+            SekInterrupt(irq); // update line\r
+\r
+            if (irq) SekEndRun(24); // make it delayed\r
           }\r
-#endif\r
         }\r
         else\r
 #endif\r