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

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index db7b2b7..6aabe88 100644
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -1,7 +1,7 @@
-// This is part of Pico Library
+// PicoDrive
 
 // (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006-2007, Grazvydas "notaz" Ignotas
+// (c) Copyright 2006-2008, Grazvydas "notaz" Ignotas
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
@@ -35,7 +35,9 @@ static void VideoWrite(u16 d)
   {
     case 1: if(a&1) d=(u16)((d<<8)|(d>>8)); // If address is odd, bytes are swapped (which game needs this?)
             Pico.vram [(a>>1)&0x7fff]=d;
-            rendstatus |= PDRAW_DIRTY_SPRITES; break;
+            if (a - ((unsigned)(Pico.video.reg[5]&0x7f) << 9) < 0x400)
+              rendstatus |= PDRAW_DIRTY_SPRITES;
+            break;
     case 3: Pico.m.dirtyPal = 1;
             Pico.cram [(a>>1)&0x003f]=d; break; // wraps (Desert Strike)
     case 5: Pico.vsram[(a>>1)&0x003f]=d; break;
@@ -362,7 +364,8 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
           SekCyclesBurn(32); // penalty // 488/12-8
           if (SekCycleCnt>=SekCycleAim) SekEndRun(0);
         }
-        elprintf(EL_ASVDP, "VDP data write: %04x {%i} #%i @ %06x", d, Pico.video.type, pvid->lwrite_cnt, SekPc);
+        elprintf(EL_ASVDP, "VDP data write: %04x [%06x] {%i} #%i @ %06x", d, Pico.video.addr,
+                 Pico.video.type, pvid->lwrite_cnt, SekPc);
       }
       VideoWrite(d);
     }
@@ -387,27 +390,28 @@ 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;
+        int 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;
         }
 
+        if (num == 1 && !(d&0x40) && SekCyclesLeft > 390) blank_on = 1;
+        DrawSync(blank_on);
+        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);
-            update_irq = 1;
-            break;
+            goto update_irq;
           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) blank_on = 1;
-            update_irq = 1;
-            break;
+            goto update_irq;
           case 0x05:
+            //elprintf(EL_STATUS, "spritep moved to %04x", (unsigned)(Pico.video.reg[5]&0x7f) << 9);
             if (d^dold) rendstatus |= PDRAW_SPRITES_MOVED;
             break;
           case 0x0c:
@@ -415,10 +419,9 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
             if ((d^dold)&8) Pico.m.dirtyPal = 2;
             break;
         }
-        DrawSync(blank_on);
-        pvid->reg[num]=(unsigned char)d;
-        if (!update_irq) return;
+        return;
 
+update_irq:
 #ifndef EMU_CORE_DEBUG
         // update IRQ level
         if (!SekShouldInterrupt) // hack
@@ -449,24 +452,19 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
 {
   a&=0x1c;
 
-  if (a==0x00) // data port
-  {
-    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
+    //if (PicoOpt&POPT_ALT_RENDERER) d|=0x0020; // sprite collision (Shadow of the Beast)
     if (SekCyclesLeft < 84+4)      d|=0x0004; // H-Blank (Sonic3 vs)
 
-    d|=(pv->pending_ints&0x20)<<2; // V-int pending?
+    d |= ((pv->reg[1]&0x40)^0x40) >> 3;  // set V-Blank if display is disabled
+    d |= (pv->pending_ints&0x20)<<2;     // V-int pending?
     if (d&0x100) pv->status&=~0x100; // FIFO no longer full
 
-    pv->pending=0; // ctrl port reads clear write-pending flag (Charles MacDonald)
+    pv->pending = 0; // ctrl port reads clear write-pending flag (Charles MacDonald)
 
     elprintf(EL_SR, "SR read: %04x @ %06x", d, SekPc);
     return d;
@@ -489,32 +487,60 @@ 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, d;
+    unsigned int d;
     int lineCycles;
-    
-    lineCycles = (488-SekCyclesLeft)&0x1ff;
-    d = Pico.m.scanline; // V-Counter
 
+    lineCycles = (488-SekCyclesLeft)&0x1ff;
     if (Pico.video.reg[12]&1)
-         hc=hcounts_40[lineCycles];
-    else hc=hcounts_32[lineCycles];
+         d = hcounts_40[lineCycles];
+    else d = hcounts_32[lineCycles];
 
-    if (Pico.m.pal) {
-      if (d >= 0x103) d-=56; // based on Gens
-    } else {
-      if (d >= 0xEB)  d-=6;
-    }
+    elprintf(EL_HVCNT, "hv: %02x %02x (%i) @ %06x", d, Pico.video.v_counter, SekCyclesDone(), SekPc);
+    return d | (Pico.video.v_counter << 8);
+  }
 
-    if ((Pico.video.reg[12]&6) == 6) {
-      // interlace mode 2 (Combat Cars (UE) [!])
-      d <<= 1;
-      if (d&0xf00) d|= 1;
-    }
+  if (a==0x00) // data port
+  {
+    return VideoRead();
+  }
 
-    elprintf(EL_HVCNT, "hv: %02x %02x (%i) @ %06x", hc, d, SekCyclesDone(), SekPc);
-    d&=0xff; d<<=8;
-    d|=hc;
-    return d;
+  return 0;
+}
+
+unsigned int PicoVideoRead8(unsigned int a)
+{
+  unsigned int d;
+  a&=0x1d;
+
+  switch (a)
+  {
+    case 0: return VideoRead() >> 8;
+    case 1: return VideoRead() & 0xff;
+    case 4: // control port/status reg
+      d = Pico.video.status >> 8;
+      if (d&1) Pico.video.status&=~0x100; // FIFO no longer full
+      Pico.video.pending = 0;
+      elprintf(EL_SR, "SR read (h): %02x @ %06x", d, SekPc);
+      return d;
+    case 5:
+      d = Pico.video.status & 0xff;
+      //if (PicoOpt&POPT_ALT_RENDERER) d|=0x0020; // sprite collision (Shadow of the Beast)
+      d |= ((Pico.video.reg[1]&0x40)^0x40) >> 3;  // set V-Blank if display is disabled
+      d |= (Pico.video.pending_ints&0x20)<<2;     // V-int pending?
+      if (SekCyclesLeft < 84+4) d |= 4;    // H-Blank
+      Pico.video.pending = 0;
+      elprintf(EL_SR, "SR read (l): %02x @ %06x", d, SekPc);
+      return d;
+    case 8: // hv counter
+      elprintf(EL_HVCNT, "vcounter: %02x (%i) @ %06x", Pico.video.v_counter, SekCyclesDone(), SekPc);
+      return Pico.video.v_counter;
+    case 9:
+      d = (488-SekCyclesLeft)&0x1ff;
+      if (Pico.video.reg[12]&1)
+           d = hcounts_40[d];
+      else d = hcounts_32[d];
+      elprintf(EL_HVCNT, "hcounter: %02x (%i) @ %06x", d, SekCyclesDone(), SekPc);
+      return d;
   }
 
   return 0;