X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcd%2Fmemory.c;h=8fce606fcd5429a38104d51f73a0921853d0cc5f;hb=33be04ca5fee314271f1959672e22cf94d670ea6;hp=47553f57277f7c3a19f8881e1a420beace345ece;hpb=ecc8036ee27ec57454c3fe736a71dd9c0cbcf3de;p=picodrive.git

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