trying to add movie support

[picodrive.git] / Pico / VideoPort.c

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index 024cf6f..5d972f5 100644 (file)
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -53,7 +53,7 @@ static unsigned int VideoRead()
     case 8: d=Pico.cram [a&0x003f]; break;\r
     case 4: d=Pico.vsram[a&0x003f]; break;\r
   }\r
-  \r
+\r
   AutoIncrement();\r
   return d;\r
 }\r
@@ -99,22 +99,26 @@ static void DmaSlow(int len)
   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]", Pico.video.type, source, a, len, inc,\r
+           (Pico.video.status&8)||!(Pico.video.reg[1]&0x40), Pico.m.scanline, SekCyclesDone());\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
   else return; // Invalid source address\r
 \r
+#if 0\r
   // CPU is stopped during DMA, so we burn some cycles to compensate that\r
   if((Pico.video.status&8)||!(Pico.video.reg[1]&0x40)) { // vblank?\r
       burn = (len*(((488<<8)/167))>>8); // very approximate\r
       if(!(Pico.video.status&8)) burn+=burn>>1; // a hack for Legend of Galahad\r
   } else burn = DmaSlowBurn(len);\r
   SekCyclesBurn(burn);\r
+#else\r
+  Pico.m.dma_bytes += len;\r
+#endif\r
   if(!(Pico.video.status&8))\r
     SekEndRun(0);\r
-  //dprintf("DmaSlow burn: %i @ %06x", burn, SekPc);\r
+//  dprintf("DmaSlow burn: %i @ %06x", burn, SekPc);\r
 \r
   switch (Pico.video.type)\r
   {\r
@@ -132,10 +136,10 @@ static void DmaSlow(int len)
       }\r
       rendstatus|=0x10;\r
       break;\r
-    \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
+      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
@@ -177,7 +181,10 @@ static void DmaCopy(int len)
   unsigned char *vrs;\r
   unsigned char inc=Pico.video.reg[0xf];\r
   int source;\r
-  //dprintf("DmaCopy len %i [%i|%i]", len, Pico.m.scanline, SekCyclesDone());\r
+  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
 \r
   source =Pico.video.reg[0x15];\r
   source|=Pico.video.reg[0x16]<<8;\r
@@ -205,9 +212,12 @@ static void DmaFill(int data)
   unsigned char *vr=(unsigned char *) Pico.vram;\r
   unsigned char high = (unsigned char) (data >> 8);\r
   unsigned char inc=Pico.video.reg[0xf];\r
-  \r
+\r
   len=GetDmaLength();\r
-  //dprintf("DmaFill len %i inc %i [%i|%i]", len, inc, Pico.m.scanline, SekCyclesDone());\r
+  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
 \r
   // from Charles MacDonald's genvdp.txt:\r
   // Write lower byte to address specified\r
@@ -273,7 +283,7 @@ void PicoVideoWrite(unsigned int a,unsigned short d)
   a&=0x1c;\r
 \r
   if (a==0x00) // Data port 0 or 2\r
-  {    \r
+  {\r
     if (pvid->pending) CommandChange();\r
     pvid->pending=0;\r
 \r
@@ -351,7 +361,7 @@ void PicoVideoWrite(unsigned int a,unsigned short d)
 unsigned int PicoVideoRead(unsigned int a)\r
 {\r
   unsigned int d=0;\r
-  \r
+\r
   a&=0x1c;\r
 \r
   if (a==0x00) // data port\r
@@ -362,12 +372,12 @@ unsigned int PicoVideoRead(unsigned int a)
 \r
   if (a==0x04) // control port\r
   {\r
-    //dprintf("sr_read @ %06x [%i|%i]", SekPc, Pico.m.scanline, SekCyclesDone());\r
     d=Pico.video.status;\r
     if(PicoOpt&0x10) d|=0x0020; // sprite collision (Shadow of the Beast)\r
     if(Pico.m.rotate++&8) d|=0x0100; else d|=0x0200; // Toggle fifo full empty (who uses that stuff?)\r
     if(!(Pico.video.reg[1]&0x40)) d|=0x0008; // set V-Blank if display is disabled\r
     if(SekCyclesLeft < 84+4)      d|=0x0004; // H-Blank (Sonic3 vs)\r
+    dprintf("sr_read %04x @ %06x [%i|%i]", d, SekPc, Pico.m.scanline, SekCyclesDone());\r
 \r
     Pico.video.pending=0; // ctrl port reads clear write-pending flag (Charles MacDonald)\r
 \r
@@ -387,7 +397,7 @@ unsigned int PicoVideoRead(unsigned int a)
   // |---------------------|--------------------------|\r
   // E4  (hc[0x43]==0)    07                         B1 // 40\r
   // E8  (hc[0x45]==0)    05                         91 // 32\r
-  \r
+\r
   // check: Sonic 3D Blast bonus, Cannon Fodder, Chase HQ II, 3 Ninjas kick back, Road Rash 3, Skitchin', Wheel of Fortune\r
   if ((a&0x1c)==0x08)\r
   {\r
@@ -420,7 +430,7 @@ unsigned int PicoVideoRead(unsigned int a)
       if (d&0xf00) d|= 1;\r
     }\r
 \r
-    //dprintf("hv: %02x %02x (%i) @ %06x", hc, d, SekCyclesDone(), SekPc);\r
+    dprintf("hv: %02x %02x (%i) @ %06x", hc, d, SekCyclesDone(), SekPc);\r
     d&=0xff; d<<=8;\r
     d|=hc;\r
     goto end;\r