X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcd%2Fmemory.c;h=e660e35bc5d7f5bb86e18c37d99aa71f2e539144;hb=61c4e5117aab08e03144f169f610275a2282cf75;hp=b0f5e4a8222e3a3a4e554ded06eca9a83280a363;hpb=334d9fb6543169acca1969b08f78d91870f4d22c;p=picodrive.git

diff --git a/pico/cd/memory.c b/pico/cd/memory.c
index b0f5e4a..e660e35 100644
--- a/pico/cd/memory.c
+++ b/pico/cd/memory.c
@@ -67,6 +67,12 @@ static void remap_word_ram(u32 r3);
 void m68k_comm_check(u32 a)
 {
   pcd_sync_s68k(SekCyclesDone(), 0);
+  if (a >= 0x0e && !Pico_mcd->m.need_sync) {
+    // there are cases when slave updates comm and only switches RAM
+    // over after that (mcd1b), so there must be a resync..
+    SekEndRun(64);
+    Pico_mcd->m.need_sync = 1;
+  }
   if (SekNotPolling || a != Pico_mcd->m.m68k_poll_a) {
     Pico_mcd->m.m68k_poll_a = a;
     Pico_mcd->m.m68k_poll_cnt = 0;
@@ -100,7 +106,7 @@ static u32 m68k_reg_read16(u32 a)
       d = *(u16 *)(Pico_mcd->bios + 0x72);
       goto end;
     case 8:
-      d = Read_CDC_Host(0);
+      d = cdc_host_r();
       goto end;
     case 0xA:
       elprintf(EL_UIO, "m68k FIXME: reserved read");
@@ -286,9 +292,9 @@ u32 s68k_reg_read16(u32 a)
       elprintf(EL_CDREG3, "s68k_regs r3: %02x @%06x", (u8)d, SekPcS68k);
       return s68k_poll_detect(a, d);
     case 6:
-      return CDC_Read_Reg();
+      return cdc_reg_r();
     case 8:
-      return Read_CDC_Host(1); // Gens returns 0 here on byte reads
+      return cdc_host_r();
     case 0xC:
       d = SekCyclesDoneS68k() - Pico_mcd->m.stopwatch_base_c;
       d /= 384;
@@ -379,7 +385,7 @@ void s68k_reg_write8(u32 a, u32 d)
       //dprintf("s68k CDC reg addr: %x", d&0xf);
       break;
     case 7:
-      CDC_Write_Reg(d);
+      cdc_reg_w(d & 0xff);
       return;
     case 0xa:
       elprintf(EL_CDREGS, "s68k set CDC dma addr");
@@ -407,8 +413,11 @@ void s68k_reg_write8(u32 a, u32 d)
       elprintf(EL_CDREGS|EL_CD, "s68k irq mask: %02x", d);
       d &= 0x7e;
       if ((d ^ Pico_mcd->s68k_regs[0x33]) & d & PCDS_IEN4) {
-        if (Pico_mcd->s68k_regs[0x37] & 4)
-          CDD_Export_Status();
+        // XXX: emulate pending irq instead?
+        if (Pico_mcd->s68k_regs[0x37] & 4) {
+          elprintf(EL_INTS, "cdd export irq 4 (unmask)");
+          SekInterruptS68k(4);
+        }
       }
       break;
     case 0x34: // fader
@@ -418,15 +427,36 @@ void s68k_reg_write8(u32 a, u32 d)
       return; // d/m bit is unsetable
     case 0x37: {
       u32 d_old = Pico_mcd->s68k_regs[0x37];
-      Pico_mcd->s68k_regs[0x37] = d&7;
+      Pico_mcd->s68k_regs[0x37] = d & 7;
       if ((d&4) && !(d_old&4)) {
-        CDD_Export_Status();
+        // ??
+        pcd_event_schedule_s68k(PCD_EVENT_CDC, 12500000/75);
+
+        if (Pico_mcd->s68k_regs[0x33] & PCDS_IEN4) {
+          elprintf(EL_INTS, "cdd export irq 4");
+          SekInterruptS68k(4);
+        }
       }
       return;
     }
     case 0x4b:
-      Pico_mcd->s68k_regs[a] = (u8) d;
-      CDD_Import_Command();
+      Pico_mcd->s68k_regs[a] = 0; // (u8) d; ?
+      cdd_process();
+      {
+        static const char *nm[] =
+          { "stat", "stop", "read_toc", "play",
+            "seek", "???",  "pause",    "resume",
+            "ff",   "fr",   "tjump",    "???",
+            "close","open", "???",      "???" };
+        u8 *c = &Pico_mcd->s68k_regs[0x42];
+        u8 *s = &Pico_mcd->s68k_regs[0x38];
+        elprintf(EL_CD,
+          "CDD command: %02x %02x %02x %02x %02x %02x %02x %02x %12s",
+          c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], nm[c[0] & 0x0f]);
+        elprintf(EL_CD,
+          "CDD status:  %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+          s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7], s[8], s[9]);
+      }
       return;
     case 0x58:
       return;