X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FVideoPort.c;h=cceab7c7cb6e6a79e92ddad5b2d13b320a7aba4d;hb=fad248933b6676d30ccf419858b4ee10cc123fc5;hp=62f487a762f3ac6dbc9c65d292d34ae0388019be;hpb=d26dc685a40a0ee8db48d3375b2f59ad515af8eb;p=picodrive.git

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index 62f487a..cceab7c 100644
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -134,11 +134,12 @@ static void DmaSlow(int len)
       return;
     }
   } else {
-    if (source<Pico.romsize) { // Rom
+    // if we have DmaHook, let it handle ROM because of possible DMA delay
+    if (PicoDmaHook && PicoDmaHook(source, len, &pd, &pdend));
+    else if (source<Pico.romsize) { // Rom
       pd=(u16 *)(Pico.rom+(source&~1));
       pdend=(u16 *)(Pico.rom+Pico.romsize);
     }
-    else if (PicoDmaHook && PicoDmaHook(source, len, &pd, &pdend));
     else {
       elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow[%i] %06x->%04x: invalid src", Pico.video.type, source, a);
       return;
@@ -370,19 +371,24 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
       {
         // Register write:
         int num=(d>>8)&0x1f;
-        if(num==00) elprintf(EL_INTSW, "hint_onoff: %i->%i [%i] pend=%i @ %06x", (pvid->reg[0]&0x10)>>4,
+        int dold=pvid->reg[num];
+        if (num > 0x0a && !(pvid->reg[1]&4)) {
+          elprintf(EL_ANOMALY, "%02x written to reg %02x in SMS mode @ %06x", d, num, SekPc);
+        } else
+	  pvid->reg[num]=(unsigned char)d;
+        if (num==00) elprintf(EL_INTSW, "hint_onoff: %i->%i [%i] pend=%i @ %06x", (dold&0x10)>>4,
                         (d&0x10)>>4, SekCyclesDone(), (pvid->pending_ints&0x10)>>4, SekPc);
-        if(num==01) elprintf(EL_INTSW, "vint_onoff: %i->%i [%i] pend=%i @ %06x", (pvid->reg[1]&0x20)>>5,
+        if (num==01) 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(num==01) dprintf("set_blank: %i @ %06x [%i|%i]", !((d&0x40)>>6), SekPc, Pico.m.scanline, SekCyclesDone());
-        //if(num==10) dprintf("hint_set: %i @ %06x [%i|%i]", (unsigned char)d, SekPc, Pico.m.scanline, SekCyclesDone());
-        pvid->reg[num]=(unsigned char)d;
+        if      (num ==   5 && (d^dold)) rendstatus|=1;
+        // renderers should update their palettes if sh/hi mode is changed
+        else if (num == 0xc && ((d^dold)&8)) Pico.m.dirtyPal = 2;
 #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
-        if (num < 2)
+        else if (num < 2)
         {
           if (!SekShouldInterrupt) // hack
           {
@@ -393,13 +399,10 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
             else if(pints & 0x10) irq = 4;
             SekInterrupt(irq); // update line
 
-            if (irq) SekEndRun(24); // make it delayed
+            if (irq && Pico.m.scanline!=-1) SekEndRun(24); // make it delayed
           }
         }
-        else
 #endif
-        if(num == 5) rendstatus|=1;
-        else if(num == 0xc) Pico.m.dirtyPal = 2; // renderers should update their palettes if sh/hi mode is changed
         pvid->type=0; // register writes clear command (else no Sega logo in Golden Axe II)
       } else {
         // High word of command: