cd: switch to CD drive emu code from genplus

[picodrive.git] / pico / cd / memory.c

diff --git a/pico/cd/memory.c b/pico/cd/memory.c
index 2c53b33..7d838fc 100644 (file)
--- a/pico/cd/memory.c
+++ b/pico/cd/memory.c
@@ -100,7 +100,7 @@ static u32 m68k_reg_read16(u32 a)
       d = *(u16 *)(Pico_mcd->bios + 0x72);\r
       goto end;\r
     case 8:\r
-      d = Read_CDC_Host(0);\r
+      d = cdc_host_r();\r
       goto end;\r
     case 0xA:\r
       elprintf(EL_UIO, "m68k FIXME: reserved read");\r
@@ -222,12 +222,13 @@ write_comm:
 \r
   pcd_sync_s68k(SekCyclesDone(), 0);\r
   Pico_mcd->s68k_regs[a] = d;\r
-  if (Pico_mcd->m.s68k_poll_a == (a & ~1)\r
-      && Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT)\r
+  if (Pico_mcd->m.s68k_poll_a == (a & ~1))\r
   {\r
-    SekSetStopS68k(0);\r
+    if (Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT) {\r
+      elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);\r
+      SekSetStopS68k(0);\r
+    }\r
     Pico_mcd->m.s68k_poll_a = 0;\r
-    elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);\r
   }\r
 }\r
 \r
@@ -285,9 +286,9 @@ u32 s68k_reg_read16(u32 a)
       elprintf(EL_CDREG3, "s68k_regs r3: %02x @%06x", (u8)d, SekPcS68k);\r
       return s68k_poll_detect(a, d);\r
     case 6:\r
-      return CDC_Read_Reg();\r
+      return cdc_reg_r();\r
     case 8:\r
-      return Read_CDC_Host(1); // Gens returns 0 here on byte reads\r
+      return cdc_host_r();\r
     case 0xC:\r
       d = SekCyclesDoneS68k() - Pico_mcd->m.stopwatch_base_c;\r
       d /= 384;\r
@@ -378,7 +379,7 @@ void s68k_reg_write8(u32 a, u32 d)
       //dprintf("s68k CDC reg addr: %x", d&0xf);\r
       break;\r
     case 7:\r
-      CDC_Write_Reg(d);\r
+      cdc_reg_w(d);\r
       return;\r
     case 0xa:\r
       elprintf(EL_CDREGS, "s68k set CDC dma addr");\r
@@ -406,8 +407,11 @@ void s68k_reg_write8(u32 a, u32 d)
       elprintf(EL_CDREGS|EL_CD, "s68k irq mask: %02x", d);\r
       d &= 0x7e;\r
       if ((d ^ Pico_mcd->s68k_regs[0x33]) & d & PCDS_IEN4) {\r
-        if (Pico_mcd->s68k_regs[0x37] & 4)\r
-          CDD_Export_Status();\r
+        // XXX: emulate pending irq instead?\r
+        if (Pico_mcd->s68k_regs[0x37] & 4) {\r
+          elprintf(EL_INTS, "cdd export irq 4 (unmask)");\r
+          SekInterruptS68k(4);\r
+        }\r
       }\r
       break;\r
     case 0x34: // fader\r
@@ -417,15 +421,21 @@ void s68k_reg_write8(u32 a, u32 d)
       return; // d/m bit is unsetable\r
     case 0x37: {\r
       u32 d_old = Pico_mcd->s68k_regs[0x37];\r
-      Pico_mcd->s68k_regs[0x37] = d&7;\r
+      Pico_mcd->s68k_regs[0x37] = d & 7;\r
       if ((d&4) && !(d_old&4)) {\r
-        CDD_Export_Status();\r
+        // ??\r
+        pcd_event_schedule_s68k(PCD_EVENT_CDC, 12500000/75);\r
+\r
+        if (Pico_mcd->s68k_regs[0x33] & PCDS_IEN4) {\r
+          elprintf(EL_INTS, "cdd export irq 4");\r
+          SekInterruptS68k(4);\r
+        }\r
       }\r
       return;\r
     }\r
     case 0x4b:\r
       Pico_mcd->s68k_regs[a] = (u8) d;\r
-      CDD_Import_Command();\r
+      cdd_process();\r
       return;\r
     case 0x58:\r
       return;\r
@@ -662,7 +672,7 @@ void PicoWrite8_mcd_io(u32 a, u32 d)
     return;\r
   }\r
 \r
-  PicoWrite16_io(a, d);\r
+  PicoWrite8_io(a, d);\r
 }\r
 \r
 void PicoWrite16_mcd_io(u32 a, u32 d)\r
@@ -671,7 +681,7 @@ void PicoWrite16_mcd_io(u32 a, u32 d)
     elprintf(EL_CDREGS, "m68k_regs w16: [%02x] %04x @%06x",\r
       a & 0x3f, d, SekPc);\r
 \r
-    m68k_reg_write8(a,     d >> 8);\r
+    m68k_reg_write8(a, d >> 8);\r
     if ((a & 0x3e) != 0x0e) // special case\r
       m68k_reg_write8(a + 1, d & 0xff);\r
     return;\r