cd: rewrite pcm

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

diff --git a/pico/cd/memory.c b/pico/cd/memory.c
index 47553f5..8fce606 100644 (file)
--- a/pico/cd/memory.c
+++ b/pico/cd/memory.c
@@ -10,7 +10,6 @@
 #include "../memory.h"\r
 \r
 #include "gfx_cd.h"\r
-#include "pcm.h"\r
 \r
 uptr s68k_read8_map  [0x1000000 >> M68K_MEM_SHIFT];\r
 uptr s68k_read16_map [0x1000000 >> M68K_MEM_SHIFT];\r
@@ -28,11 +27,6 @@ MAKE_68K_WRITE32(s68k_write32, s68k_write16_map)
 \r
 // provided by ASM code:\r
 #ifdef _ASM_CD_MEMORY_C\r
-u32 PicoReadM68k8_io(u32 a);\r
-u32 PicoReadM68k16_io(u32 a);\r
-void PicoWriteM68k8_io(u32 a, u32 d);\r
-void PicoWriteM68k16_io(u32 a, u32 d);\r
-\r
 u32 PicoReadS68k8_pr(u32 a);\r
 u32 PicoReadS68k16_pr(u32 a);\r
 void PicoWriteS68k8_pr(u32 a, u32 d);\r
@@ -336,6 +330,10 @@ void s68k_reg_write8(u32 a, u32 d)
 {\r
   // Warning: d might have upper bits set\r
   switch (a) {\r
+    case 1:\r
+      if (!(d & 1))\r
+        pcd_soft_reset();\r
+      return;\r
     case 2:\r
       return; // only m68k can change WP\r
     case 3: {\r
@@ -566,7 +564,7 @@ static void PicoWriteM68k16_ramc(u32 a, u32 d)
 \r
 // IO/control/cd registers (a10000 - ...)\r
 #ifndef _ASM_CD_MEMORY_C\r
-static u32 PicoReadM68k8_io(u32 a)\r
+u32 PicoRead8_mcd_io(u32 a)\r
 {\r
   u32 d;\r
   if ((a & 0xff00) == 0x2000) { // a12000 - a120ff\r
@@ -583,7 +581,7 @@ static u32 PicoReadM68k8_io(u32 a)
   return PicoRead8_io(a);\r
 }\r
 \r
-static u32 PicoReadM68k16_io(u32 a)\r
+u32 PicoRead16_mcd_io(u32 a)\r
 {\r
   u32 d;\r
   if ((a & 0xff00) == 0x2000) {\r
@@ -596,7 +594,7 @@ static u32 PicoReadM68k16_io(u32 a)
   return PicoRead16_io(a);\r
 }\r
 \r
-static void PicoWriteM68k8_io(u32 a, u32 d)\r
+void PicoWrite8_mcd_io(u32 a, u32 d)\r
 {\r
   if ((a & 0xff00) == 0x2000) { // a12000 - a120ff\r
     elprintf(EL_CDREGS, "m68k_regs w8:  [%02x]   %02x @%06x",\r
@@ -608,7 +606,7 @@ static void PicoWriteM68k8_io(u32 a, u32 d)
   PicoWrite16_io(a, d);\r
 }\r
 \r
-static void PicoWriteM68k16_io(u32 a, u32 d)\r
+void PicoWrite16_mcd_io(u32 a, u32 d)\r
 {\r
   if ((a & 0xff00) == 0x2000) { // a12000 - a120ff\r
     elprintf(EL_CDREGS, "m68k_regs w16: [%02x] %04x @%06x",\r
@@ -835,13 +833,10 @@ regs_done:
     a &= 0x7fff;\r
     if (a >= 0x2000)\r
       d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a >> 1) & 0xfff];\r
-    else if (a >= 0x20) {\r
-      a &= 0x1e;\r
-      d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT;\r
-      if (a & 2)\r
-        d >>= 8;\r
-    }\r
-    return d & 0xff;\r
+    else if (a >= 0x20)\r
+      d = pcd_pcm_read(a >> 1);\r
+\r
+    return d;\r
   }\r
 \r
   return s68k_unmapped_read8(a);\r
@@ -865,16 +860,12 @@ static u32 PicoReadS68k16_pr(u32 a)
 \r
   // PCM\r
   if ((a & 0x8000) == 0x0000) {\r
-    //elprintf(EL_ANOMALY, "FIXME: s68k_pcm r16: [%06x] @%06x", a, SekPcS68k);\r
     a &= 0x7fff;\r
     if (a >= 0x2000)\r
-      d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff];\r
-    else if (a >= 0x20) {\r
-      a &= 0x1e;\r
-      d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT;\r
-      if (a & 2) d >>= 8;\r
-    }\r
-    elprintf(EL_CDREGS, "ret = %04x", d);\r
+      d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a >> 1) & 0xfff];\r
+    else if (a >= 0x20)\r
+      d = pcd_pcm_read(a >> 1);\r
+\r
     return d;\r
   }\r
 \r
@@ -899,7 +890,7 @@ static void PicoWriteS68k8_pr(u32 a, u32 d)
     if (a >= 0x2000)\r
       Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff] = d;\r
     else if (a < 0x12)\r
-      pcm_write(a>>1, d);\r
+      pcd_pcm_write(a>>1, d);\r
     return;\r
   }\r
 \r
@@ -933,7 +924,7 @@ static void PicoWriteS68k16_pr(u32 a, u32 d)
     if (a >= 0x2000)\r
       Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff] = d;\r
     else if (a < 0x12)\r
-      pcm_write(a>>1, d & 0xff);\r
+      pcd_pcm_write(a>>1, d & 0xff);\r
     return;\r
   }\r
 \r
@@ -1057,10 +1048,10 @@ PICO_INTERNAL void PicoMemSetupCD(void)
   }\r
 \r
   // registers/IO:\r
-  cpu68k_map_set(m68k_read8_map,   0xa10000, 0xa1ffff, PicoReadM68k8_io, 1);\r
-  cpu68k_map_set(m68k_read16_map,  0xa10000, 0xa1ffff, PicoReadM68k16_io, 1);\r
-  cpu68k_map_set(m68k_write8_map,  0xa10000, 0xa1ffff, PicoWriteM68k8_io, 1);\r
-  cpu68k_map_set(m68k_write16_map, 0xa10000, 0xa1ffff, PicoWriteM68k16_io, 1);\r
+  cpu68k_map_set(m68k_read8_map,   0xa10000, 0xa1ffff, PicoRead8_mcd_io, 1);\r
+  cpu68k_map_set(m68k_read16_map,  0xa10000, 0xa1ffff, PicoRead16_mcd_io, 1);\r
+  cpu68k_map_set(m68k_write8_map,  0xa10000, 0xa1ffff, PicoWrite8_mcd_io, 1);\r
+  cpu68k_map_set(m68k_write16_map, 0xa10000, 0xa1ffff, PicoWrite16_mcd_io, 1);\r
 \r
   // sub68k map\r
   cpu68k_map_set(s68k_read8_map,   0x000000, 0xffffff, s68k_unmapped_read8, 1);\r