additional movie tweaking

[picodrive.git] / Pico / VideoPort.c

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index 5d972f5..75267c3 100644 (file)
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -58,6 +58,7 @@ static unsigned int VideoRead()
   return d;\r
 }\r
 \r
+#if 0\r
 // calculate the number of cycles 68k->VDP dma operation would take\r
 static int DmaSlowBurn(int len)\r
 {\r
@@ -75,6 +76,7 @@ static int DmaSlowBurn(int len)
 \r
   return burn;\r
 }\r
+#endif\r
 \r
 static int GetDmaLength()\r
 {\r
@@ -93,14 +95,15 @@ static void DmaSlow(int len)
   u16 *pd=0, *pdend, *r;\r
   unsigned int a=Pico.video.addr, a2, d;\r
   unsigned char inc=Pico.video.reg[0xf];\r
-  unsigned int source, burn;\r
+  unsigned int source; // , burn;\r
 \r
   source =Pico.video.reg[0x15]<<1;\r
   source|=Pico.video.reg[0x16]<<9;\r
   source|=Pico.video.reg[0x17]<<17;\r
 \r
-  dprintf("DmaSlow[%i] %06x->%04x len %i inc=%i blank %i [%i|%i]", Pico.video.type, source, a, len, inc,\r
-           (Pico.video.status&8)||!(Pico.video.reg[1]&0x40), Pico.m.scanline, SekCyclesDone());\r
+  dprintf("DmaSlow[%i] %06x->%04x len %i inc=%i blank %i [%i|%i] @ %x",\r
+    Pico.video.type, source, a, len, inc, (Pico.video.status&8)||!(Pico.video.reg[1]&0x40),\r
+    Pico.m.scanline, SekCyclesDone(), SekPc);\r
 \r
   if ((source&0xe00000)==0xe00000) { pd=(u16 *)(Pico.ram+(source&0xfffe)); pdend=(u16 *)(Pico.ram+0x10000); } // Ram\r
   else if(source<Pico.romsize)     { pd=(u16 *)(Pico.rom+(source&~1)); pdend=(u16 *)(Pico.rom+Pico.romsize); } // Rom\r
@@ -116,8 +119,12 @@ static void DmaSlow(int len)
 #else\r
   Pico.m.dma_bytes += len;\r
 #endif\r
-  if(!(Pico.video.status&8))\r
-    SekEndRun(0);\r
+  //if(!(Pico.video.status&8))\r
+//    SekEndRun(0);\r
+       //Pico.m.dma_endcycles  = 0;//SekCyclesLeft;\r
+       //Pico.m.dma_endcycles -= Pico.m.dma_endcycles>>3; // hack\r
+       SekSetCyclesLeft(SekCyclesLeft - CheckDMA());\r
+//    CheckDMA();\r
 //  dprintf("DmaSlow burn: %i @ %06x", burn, SekPc);\r
 \r
   switch (Pico.video.type)\r
@@ -138,8 +145,6 @@ static void DmaSlow(int len)
       break;\r
 \r
     case 3: // cram\r
-      dprintf("DmaSlow[%i] %06x->%04x len %i inc=%i blank %i [%i|%i]", Pico.video.type, source, a, len, inc,\r
-               (Pico.video.status&8)||!(Pico.video.reg[1]&0x40), Pico.m.scanline, SekCyclesDone());\r
       Pico.m.dirtyPal = 1;\r
       r = Pico.cram;\r
       for(a2=a&0x7f; len; len--)\r
@@ -184,7 +189,8 @@ static void DmaCopy(int len)
   dprintf("DmaCopy len %i [%i|%i]", len, Pico.m.scanline, SekCyclesDone());\r
 \r
   Pico.m.dma_bytes += len;\r
-  Pico.video.status|=2; // dma busy\r
+  if(Pico.m.scanline != -1)\r
+    Pico.video.status|=2; // dma busy\r
 \r
   source =Pico.video.reg[0x15];\r
   source|=Pico.video.reg[0x16]<<8;\r
@@ -217,7 +223,8 @@ static void DmaFill(int data)
   dprintf("DmaFill len %i inc %i [%i|%i]", len, inc, Pico.m.scanline, SekCyclesDone());\r
 \r
   Pico.m.dma_bytes += len;\r
-  Pico.video.status|=2; // dma busy\r
+  if(Pico.m.scanline != -1)\r
+    Pico.video.status|=2; // dma busy (in accurate mode)\r
 \r
   // from Charles MacDonald's genvdp.txt:\r
   // Write lower byte to address specified\r
@@ -314,8 +321,8 @@ void PicoVideoWrite(unsigned int a,unsigned short d)
       {\r
         // Register write:\r
         int num=(d>>8)&0x1f;\r
-        //if(num==00) dprintf("hint_onoff: %i->%i [%i|%i] pend=%i @ %06x", (pvid->reg[0]&0x10)>>4, (d&0x10)>>4, Pico.m.scanline, SekCyclesDone(), (pvid->pending_ints&0x10)>>4, SekPc);\r
-        //if(num==01) dprintf("vint_onoff: %i->%i [%i|%i] pend=%i @ %06x", (pvid->reg[1]&0x20)>>5, (d&0x20)>>5, Pico.m.scanline, SekCyclesDone(), (pvid->pending_ints&0x20)>>5, SekPc);\r
+        if(num==00) dprintf("hint_onoff: %i->%i [%i|%i] pend=%i @ %06x", (pvid->reg[0]&0x10)>>4, (d&0x10)>>4, Pico.m.scanline, SekCyclesDone(), (pvid->pending_ints&0x10)>>4, SekPc);\r
+        if(num==01) dprintf("vint_onoff: %i->%i [%i|%i] pend=%i @ %06x", (pvid->reg[1]&0x20)>>5, (d&0x20)>>5, Pico.m.scanline, SekCyclesDone(), (pvid->pending_ints&0x20)>>5, SekPc);\r
         //if(num==01) dprintf("set_blank: %i @ %06x [%i|%i]", !((d&0x40)>>6), SekPc, Pico.m.scanline, SekCyclesDone());\r
         //if(num==05) dprintf("spr_set: %i @ %06x [%i|%i]", (unsigned char)d, 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
@@ -411,7 +418,7 @@ unsigned int PicoVideoRead(unsigned int a)
            hc=hcounts_40[lineCycles];\r
       else hc=hcounts_32[lineCycles];\r
 \r
-      if(lineCycles > 488-12) d++; // Wheel of Fortune\r
+      //if(lineCycles > 488-12) d++; // Wheel of Fortune\r
     } else {\r
       // get approximate V-Counter\r
       d=vcounts[SekCyclesDone()>>8];\r