X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FVideoPort.c;h=db7b2b7f742451d989b8c35e38357ac8a55a7fdd;hb=2aa27095f2dbf5b38950fcb1f856d5ffc6a70361;hp=227367fa6555218b3a33f5bcd63f2d03ee465c31;hpb=99464b6230bbe515dffb8893f6b6b51031be9157;p=picodrive.git

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index 227367f..db7b2b7 100644
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -12,7 +12,6 @@
 
 extern const unsigned char  hcounts_32[];
 extern const unsigned char  hcounts_40[];
-extern const unsigned short vcounts[];
 
 #ifndef UTYPES_DEFINED
 typedef unsigned char  u8;
@@ -43,7 +42,6 @@ static void VideoWrite(u16 d)
     //default:elprintf(EL_ANOMALY, "VDP write %04x with bad type %i", d, Pico.video.type); break;
   }
 
-  //dprintf("w[%i] @ %04x, inc=%i [%i|%i]", Pico.video.type, a, Pico.video.reg[0xf], Pico.m.scanline, SekCyclesDone());
   AutoIncrement();
 }
 
@@ -92,14 +90,9 @@ static void DmaSlow(int len)
     Pico.video.type, source, a, len, inc, (Pico.video.status&8)||!(Pico.video.reg[1]&0x40),
     SekCyclesDone(), SekPc);
 
-  if (Pico.m.scanline != -1) {
-    Pico.m.dma_xfers += len;
-    if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCyclesBurn(CheckDMA());
-    else SekSetCyclesLeftNoMCD(SekCyclesLeftNoMCD - CheckDMA());
-  } else {
-    // be approximate in non-accurate mode
-    SekSetCyclesLeft(SekCyclesLeft - (len*(((488<<8)/167))>>8));
-  }
+  Pico.m.dma_xfers += len;
+  if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCyclesBurn(CheckDMA());
+  else SekSetCyclesLeftNoMCD(SekCyclesLeftNoMCD - CheckDMA());
 
   if ((source&0xe00000)==0xe00000) { // Ram
     pd=(u16 *)(Pico.ram+(source&0xfffe));
@@ -230,16 +223,15 @@ static void DmaCopy(int len)
   elprintf(EL_VDPDMA, "DmaCopy len %i [%i]", len, SekCyclesDone());
 
   Pico.m.dma_xfers += len;
-  if(Pico.m.scanline != -1)
-    Pico.video.status|=2; // dma busy
+  Pico.video.status |= 2; // dma busy
 
   source =Pico.video.reg[0x15];
   source|=Pico.video.reg[0x16]<<8;
   vrs=vr+source;
 
-  if(source+len > 0x10000) len=0x10000-source; // clip??
+  if (source+len > 0x10000) len=0x10000-source; // clip??
 
-  for(;len;len--)
+  for (; len; len--)
   {
     vr[a] = *vrs++;
     // AutoIncrement
@@ -264,17 +256,16 @@ static void DmaFill(int data)
   elprintf(EL_VDPDMA, "DmaFill len %i inc %i [%i]", len, inc, SekCyclesDone());
 
   Pico.m.dma_xfers += len;
-  if(Pico.m.scanline != -1)
-    Pico.video.status|=2; // dma busy (in accurate mode)
+  Pico.video.status |= 2; // dma busy
 
   // from Charles MacDonald's genvdp.txt:
   // Write lower byte to address specified
   vr[a] = (unsigned char) data;
   a=(u16)(a+inc);
 
-  if(!inc) len=1;
+  if (!inc) len=1;
 
-  for(;len;len--) {
+  for (; len; len--) {
     // Write upper byte to adjacent address
     // (here we are byteswapped, so address is already 'adjacent')
     vr[a] = high;
@@ -323,14 +314,32 @@ static void CommandChange(void)
   if (cmd&0x80) CommandDma();
 }
 
+static __inline void DrawSync(int blank_on)
+{
+  if (Pico.m.scanline < 224 && !(PicoOpt & POPT_ALT_RENDERER) &&
+      !PicoSkipFrame && DrawScanline <= Pico.m.scanline) {
+    //elprintf(EL_ANOMALY, "sync");
+    PicoDrawSync(Pico.m.scanline, blank_on);
+  }
+}
+
 PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
 {
   struct PicoVideo *pvid=&Pico.video;
 
+  //if (Pico.m.scanline < 224)
+  //  elprintf(EL_STATUS, "PicoVideoWrite [%06x] %04x", a, d);
   a&=0x1c;
 
   if (a==0x00) // Data port 0 or 2
   {
+    // try avoiding the sync..
+    if (Pico.m.scanline < 224 && (pvid->reg[1]&0x40) &&
+        !(!pvid->pending &&
+          ((pvid->command & 0xc00000f0) == 0x40000010 && Pico.vsram[pvid->addr>>1] == d))
+       )
+      DrawSync(0);
+
     if (pvid->pending) {
       CommandChange();
       pvid->pending=0;
@@ -344,7 +353,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
     else
     {
       // preliminary FIFO emulation for Chaos Engine, The (E)
-      if(!(pvid->status&8) && (pvid->reg[1]&0x40) && Pico.m.scanline!=-1 && !(PicoOpt&POPT_DIS_VDP_FIFO)) // active display, accurate mode?
+      if (!(pvid->status&8) && (pvid->reg[1]&0x40) && !(PicoOpt&POPT_DIS_VDP_FIFO)) // active display?
       {
         pvid->status&=~0x200; // FIFO no longer empty
         pvid->lwrite_cnt++;
@@ -362,8 +371,9 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
 
   if (a==0x04) // Control (command) port 4 or 6
   {
-    if(pvid->pending)
+    if (pvid->pending)
     {
+      if (d & 0x80) DrawSync(0); // only need sync for DMA
       // Low word of command:
       pvid->command&=0xffff0000;
       pvid->command|=d;
@@ -377,24 +387,26 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
         // Register write:
         int num=(d>>8)&0x1f;
         int dold=pvid->reg[num];
+        int update_irq = 0, blank_on = 0;
         pvid->type=0; // register writes clear command (else no Sega logo in Golden Axe II)
         if (num > 0x0a && !(pvid->reg[1]&4)) {
           elprintf(EL_ANOMALY, "%02x written to reg %02x in SMS mode @ %06x", d, num, SekPc);
           return;
-        } else
-          pvid->reg[num]=(unsigned char)d;
+        }
 
         switch (num)
         {
           case 0x00:
             elprintf(EL_INTSW, "hint_onoff: %i->%i [%i] pend=%i @ %06x", (dold&0x10)>>4,
                     (d&0x10)>>4, SekCyclesDone(), (pvid->pending_ints&0x10)>>4, SekPc);
-            goto update_irq;
+            update_irq = 1;
+            break;
           case 0x01:
             elprintf(EL_INTSW, "vint_onoff: %i->%i [%i] pend=%i @ %06x", (dold&0x20)>>5,
                     (d&0x20)>>5, SekCyclesDone(), (pvid->pending_ints&0x20)>>5, SekPc);
-            if (!(d&0x40) && SekCyclesLeft > 390) rendstatus |= PDRAW_EARLY_BLANK;
-            goto update_irq;
+            if (!(d&0x40) && SekCyclesLeft > 390) blank_on = 1;
+            update_irq = 1;
+            break;
           case 0x05:
             if (d^dold) rendstatus |= PDRAW_SPRITES_MOVED;
             break;
@@ -403,24 +415,22 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
             if ((d^dold)&8) Pico.m.dirtyPal = 2;
             break;
         }
-        return;
+        DrawSync(blank_on);
+        pvid->reg[num]=(unsigned char)d;
+        if (!update_irq) return;
 
-update_irq:;
 #ifndef EMU_CORE_DEBUG
-        // update IRQ level (Lemmings, Wiz 'n' Liz intro, ... )
-        // may break if done improperly:
-        // International Superstar Soccer Deluxe (crash), Street Racer (logos), Burning Force (gfx),
-        // Fatal Rewind (crash), Sesame Street Counting Cafe
+        // update IRQ level
         if (!SekShouldInterrupt) // hack
         {
           int lines, pints, irq=0;
           lines = (pvid->reg[1] & 0x20) | (pvid->reg[0] & 0x10);
           pints = (pvid->pending_ints&lines);
-               if(pints & 0x20) irq = 6;
-          else if(pints & 0x10) irq = 4;
+               if (pints & 0x20) irq = 6;
+          else if (pints & 0x10) irq = 4;
           SekInterrupt(irq); // update line
 
-          if (irq && Pico.m.scanline!=-1) SekEndRun(24); // make it delayed
+          if (irq) SekEndRun(24); // make it delayed
         }
 #endif
       }
@@ -437,20 +447,17 @@ update_irq:;
 
 PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
 {
-  unsigned int d=0;
-
   a&=0x1c;
 
-
   if (a==0x00) // data port
   {
-    d=VideoRead();
-    goto end;
+    return VideoRead();
   }
 
   if (a==0x04) // control port
   {
     struct PicoVideo *pv=&Pico.video;
+    unsigned int d;
     d=pv->status;
     if (PicoOpt&POPT_ALT_RENDERER) d|=0x0020; // sprite collision (Shadow of the Beast)
     if (!(pv->reg[1]&0x40))        d|=0x0008; // set V-Blank if display is disabled
@@ -462,7 +469,7 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
     pv->pending=0; // ctrl port reads clear write-pending flag (Charles MacDonald)
 
     elprintf(EL_SR, "SR read: %04x @ %06x", d, SekPc);
-    goto end;
+    return d;
   }
 
   // H-counter info (based on Generator):
@@ -482,30 +489,23 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
   // check: Sonic 3D Blast bonus, Cannon Fodder, Chase HQ II, 3 Ninjas kick back, Road Rash 3, Skitchin', Wheel of Fortune
   if ((a&0x1c)==0x08)
   {
-    unsigned int hc;
-
-    if(Pico.m.scanline != -1) {
-      int lineCycles=(488-SekCyclesLeft)&0x1ff;
-      d=Pico.m.scanline; // V-Counter
-
-      if(Pico.video.reg[12]&1)
-           hc=hcounts_40[lineCycles];
-      else hc=hcounts_32[lineCycles];
-
-      //if(lineCycles > 488-12) d++; // Wheel of Fortune
+    unsigned int hc, d;
+    int lineCycles;
+    
+    lineCycles = (488-SekCyclesLeft)&0x1ff;
+    d = Pico.m.scanline; // V-Counter
+
+    if (Pico.video.reg[12]&1)
+         hc=hcounts_40[lineCycles];
+    else hc=hcounts_32[lineCycles];
+
+    if (Pico.m.pal) {
+      if (d >= 0x103) d-=56; // based on Gens
     } else {
-      // get approximate V-Counter
-      d=vcounts[SekCyclesDone()>>8];
-      hc = Pico.m.rotate&0xff;
+      if (d >= 0xEB)  d-=6;
     }
 
-    if(Pico.m.pal) {
-      if(d >= 0x103) d-=56; // based on Gens
-    } else {
-      if(d >= 0xEB)  d-=6;
-    }
-
-    if((Pico.video.reg[12]&6) == 6) {
+    if ((Pico.video.reg[12]&6) == 6) {
       // interlace mode 2 (Combat Cars (UE) [!])
       d <<= 1;
       if (d&0xf00) d|= 1;
@@ -514,10 +514,8 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
     elprintf(EL_HVCNT, "hv: %02x %02x (%i) @ %06x", hc, d, SekCyclesDone(), SekPc);
     d&=0xff; d<<=8;
     d|=hc;
-    goto end;
+    return d;
   }
 
-end:
-
-  return d;
+  return 0;
 }