cd: switch to CD controller code from genplus

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

diff --git a/pico/cd/memory.c b/pico/cd/memory.c
index b0f5e4a..d3a2927 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
@@ -286,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
@@ -379,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