X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fsms.c;h=286b8bf1dfe41ef61cc4a7c8d359416a64a1ab73;hb=HEAD;hp=a2351b0f45e9d7505f09717a54f28cc72ebf2287;hpb=88fd63ad10faa746ef9d7ad7d98a72e51fe2aa86;p=picodrive.git

diff --git a/pico/sms.c b/pico/sms.c
index a2351b0..286b8bf 100644
--- a/pico/sms.c
+++ b/pico/sms.c
@@ -8,10 +8,8 @@
 /*
  * TODO:
  * - start in a state as if BIOS ran
- * - remaining status flags (OVR/COL)
  * - RAM support in mapper
  * - region support
- * - SN76496 DAC-like usage
  * - H counter
  */
 #include "pico_int.h"
@@ -31,9 +29,13 @@ static unsigned char vdp_data_read(void)
 
 static unsigned char vdp_ctl_read(void)
 {
-  unsigned char d = Pico.video.pending_ints << 7;
-  Pico.video.pending = 0;
-  Pico.video.pending_ints = 0;
+  struct PicoVideo *pv = &Pico.video;
+  unsigned char d;
+
+  z80_int_assert(0);
+  d = pv->status | (pv->pending_ints << 7);
+  pv->pending = pv->pending_ints = 0;
+  pv->status = 0;
 
   elprintf(EL_SR, "VDP sr: %02x", d);
   return d;
@@ -54,14 +56,34 @@ static void vdp_data_write(unsigned char d)
   pv->pending = 0;
 }
 
-static void vdp_ctl_write(unsigned char d)
+static NOINLINE void vdp_reg_write(struct PicoVideo *pv, u8 a, u8 d)
+{
+  int l;
+
+  pv->reg[a] = d;
+  switch (a) {
+  case 0:
+    l = pv->pending_ints & (d >> 3) & 2;
+    elprintf(EL_INTS, "hint %d", l);
+    z80_int_assert(l);
+    break;
+  case 1:
+    l = pv->pending_ints & (d >> 5) & 1;
+    elprintf(EL_INTS, "vint %d", l);
+    z80_int_assert(l);
+    break;
+  }
+}
+
+static void vdp_ctl_write(u8 d)
 {
   struct PicoVideo *pv = &Pico.video;
 
   if (pv->pending) {
     if ((d >> 6) == 2) {
-      pv->reg[d & 0x0f] = pv->addr;
       elprintf(EL_IO, "  VDP r%02x=%02x", d & 0x0f, pv->addr & 0xff);
+      if (pv->reg[d & 0x0f] != (u8)pv->addr)
+        vdp_reg_write(pv, d & 0x0f, pv->addr);
     }
     pv->type = d >> 6;
     pv->addr &= 0x00ff;
@@ -105,12 +127,12 @@ static unsigned char z80_sms_in(unsigned short a)
       break;
 
     case 0xc0: /* I/O port A and B */
-      d = ~((PicoPad[0] & 0x3f) | (PicoPad[1] << 6));
+      d = ~((PicoIn.pad[0] & 0x3f) | (PicoIn.pad[1] << 6));
       break;
 
     case 0xc1: /* I/O port B and miscellaneous */
       d = (Pico.ms.io_ctl & 0x80) | ((Pico.ms.io_ctl << 1) & 0x40) | 0x30;
-      d |= ~(PicoPad[1] >> 2) & 0x0f;
+      d |= ~(PicoIn.pad[1] >> 2) & 0x0f;
       break;
   }
 
@@ -130,8 +152,9 @@ static void z80_sms_out(unsigned short a, unsigned char d)
 
     case 0x40:
     case 0x41:
-      if (PicoOpt & POPT_EN_PSG)
-        SN76496Write(d);
+      if ((d & 0x90) == 0x90 && Pico.snd.psg_line < Pico.m.scanline)
+        PsndDoPSG(Pico.m.scanline);
+      SN76496Write(d);
       break;
 
     case 0x80:
@@ -252,7 +275,7 @@ void PicoFrameMS(void)
   int lines = is_pal ? 313 : 262;
   int cycles_line = is_pal ? 58020 : 58293; /* (226.6 : 227.7) * 256 */
   int cycles_done = 0, cycles_aim = 0;
-  int skip = PicoSkipFrame;
+  int skip = PicoIn.skipFrame;
   int lines_vis = 192;
   int hint; // Hint counter
   int nmi;
@@ -260,7 +283,7 @@ void PicoFrameMS(void)
 
   PsndStartFrame();
 
-  nmi = (PicoPad[0] >> 7) & 1;
+  nmi = (PicoIn.pad[0] >> 7) & 1;
   if (!Pico.ms.nmi_state && nmi)
     z80_nmi();
   Pico.ms.nmi_state = nmi;
@@ -285,7 +308,7 @@ void PicoFrameMS(void)
         pv->pending_ints |= 2;
         if (pv->reg[0] & 0x10) {
           elprintf(EL_INTS, "hint");
-          z80_int();
+          z80_int_assert(1);
         }
       }
     }
@@ -293,16 +316,20 @@ void PicoFrameMS(void)
       pv->pending_ints |= 1;
       if (pv->reg[1] & 0x20) {
         elprintf(EL_INTS, "vint");
-        z80_int();
+        z80_int_assert(1);
       }
     }
 
+    // 224 because of how it's done for MD...
+    if (y == 224 && PicoIn.sndOut)
+      PsndGetSamplesMS();
+
     cycles_aim += cycles_line;
     cycles_done += z80_run((cycles_aim - cycles_done) >> 8) << 8;
   }
 
-  if (PsndOut)
-    PsndGetSamplesMS();
+  if (PicoIn.sndOut && Pico.snd.psg_line < lines)
+    PsndDoPSG(lines - 1);
 }
 
 void PicoFrameDrawOnlyMS(void)
@@ -316,3 +343,4 @@ void PicoFrameDrawOnlyMS(void)
     PicoLineMode4(y);
 }
 
+// vim:ts=2:sw=2:expandtab