vdp timing hacks

[picodrive.git] / pico / videoport.c

diff --git a/pico/videoport.c b/pico/videoport.c
index 0af4bbc..4da3ce3 100644 (file)
--- a/pico/videoport.c
+++ b/pico/videoport.c
@@ -223,7 +223,7 @@ static void DmaCopy(int len)
   unsigned char *vr = (unsigned char *) Pico.vram;\r
   unsigned char inc=Pico.video.reg[0xf];\r
   int source;\r
-  elprintf(EL_VDPDMA, "DmaCopy len %i [%i]", len, SekCyclesDone());\r
+  elprintf(EL_VDPDMA, "DmaCopy len %i [%u]", len, SekCyclesDone());\r
 \r
   Pico.m.dma_xfers += len;\r
   if (Pico.m.dma_xfers < len)\r
@@ -254,7 +254,7 @@ static NOINLINE void DmaFill(int data)
   int len, l;\r
 \r
   len = GetDmaLength();\r
-  elprintf(EL_VDPDMA, "DmaFill len %i inc %i [%i]", len, inc, SekCyclesDone());\r
+  elprintf(EL_VDPDMA, "DmaFill len %i inc %i [%u]", len, inc, SekCyclesDone());\r
 \r
   Pico.m.dma_xfers += len;\r
   if (Pico.m.dma_xfers < len) // lame 16bit var\r
@@ -377,14 +377,12 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
     }\r
 \r
     // preliminary FIFO emulation for Chaos Engine, The (E)\r
-    if (!(pvid->status&8) && (pvid->reg[1]&0x40) && !(PicoOpt&POPT_DIS_VDP_FIFO)) // active display?\r
+    if (!(pvid->status & SR_VB) && (pvid->reg[1] & 0x40) && !(PicoOpt&POPT_DIS_VDP_FIFO)) // active display?\r
     {\r
-      pvid->status&=~0x200; // FIFO no longer empty\r
-      pvid->lwrite_cnt++;\r
-      if (pvid->lwrite_cnt >= 4) pvid->status|=0x100; // FIFO full\r
-      if (pvid->lwrite_cnt >  4) {\r
-        SekCyclesBurnRun(32); // penalty // 488/12-8\r
-      }\r
+      int use = pvid->type == 1 ? 2 : 1;\r
+      pvid->lwrite_cnt -= use;\r
+      if (pvid->lwrite_cnt < 0)\r
+        SekCyclesLeft = 0;\r
       elprintf(EL_ASVDP, "VDP data write: %04x [%06x] {%i} #%i @ %06x", d, Pico.video.addr,\r
                Pico.video.type, pvid->lwrite_cnt, SekPc);\r
     }\r
@@ -430,11 +428,11 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
         switch (num)\r
         {\r
           case 0x00:\r
-            elprintf(EL_INTSW, "hint_onoff: %i->%i [%i] pend=%i @ %06x", (dold&0x10)>>4,\r
+            elprintf(EL_INTSW, "hint_onoff: %i->%i [%u] pend=%i @ %06x", (dold&0x10)>>4,\r
                     (d&0x10)>>4, SekCyclesDone(), (pvid->pending_ints&0x10)>>4, SekPc);\r
             goto update_irq;\r
           case 0x01:\r
-            elprintf(EL_INTSW, "vint_onoff: %i->%i [%i] pend=%i @ %06x", (dold&0x20)>>5,\r
+            elprintf(EL_INTSW, "vint_onoff: %i->%i [%u] pend=%i @ %06x", (dold&0x20)>>5,\r
                     (d&0x20)>>5, SekCyclesDone(), (pvid->pending_ints&0x20)>>5, SekPc);\r
             goto update_irq;\r
           case 0x05:\r
@@ -551,7 +549,7 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
          d = hcounts_40[d];\r
     else d = hcounts_32[d];\r
 \r
-    elprintf(EL_HVCNT, "hv: %02x %02x (%i) @ %06x", d, Pico.video.v_counter, SekCyclesDone(), SekPc);\r
+    elprintf(EL_HVCNT, "hv: %02x %02x [%u] @ %06x", d, Pico.video.v_counter, SekCyclesDone(), SekPc);\r
     return d | (Pico.video.v_counter << 8);\r
   }\r
 \r
@@ -598,7 +596,7 @@ unsigned char PicoVideoRead8CtlL(void)
 \r
 unsigned char PicoVideoRead8HV_H(void)\r
 {\r
-  elprintf(EL_HVCNT, "vcounter: %02x (%i) @ %06x", Pico.video.v_counter, SekCyclesDone(), SekPc);\r
+  elprintf(EL_HVCNT, "vcounter: %02x [%u] @ %06x", Pico.video.v_counter, SekCyclesDone(), SekPc);\r
   return Pico.video.v_counter;\r
 }\r
 \r
@@ -609,7 +607,7 @@ unsigned char PicoVideoRead8HV_L(void)
   if (Pico.video.reg[12]&1)\r
        d = hcounts_40[d];\r
   else d = hcounts_32[d];\r
-  elprintf(EL_HVCNT, "hcounter: %02x (%i) @ %06x", d, SekCyclesDone(), SekPc);\r
+  elprintf(EL_HVCNT, "hcounter: %02x [%u] @ %06x", d, SekCyclesDone(), SekPc);\r
   return d;\r
 }\r
 \r