cd: integrate new gfx code

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

diff --git a/pico/cd/memory.c b/pico/cd/memory.c
index 1d844da..2c53b33 100644 (file)
--- a/pico/cd/memory.c
+++ b/pico/cd/memory.c
@@ -9,9 +9,6 @@
 #include "../pico_int.h"\r
 #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
 uptr s68k_write8_map [0x1000000 >> M68K_MEM_SHIFT];\r
@@ -331,6 +328,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
@@ -426,6 +427,8 @@ void s68k_reg_write8(u32 a, u32 d)
       Pico_mcd->s68k_regs[a] = (u8) d;\r
       CDD_Import_Command();\r
       return;\r
+    case 0x58:\r
+      return;\r
   }\r
 \r
   if ((a&0x1f0) == 0x20)\r
@@ -447,6 +450,65 @@ write_comm:
   Pico_mcd->m.m68k_poll_cnt = 0;\r
 }\r
 \r
+void s68k_reg_write16(u32 a, u32 d)\r
+{\r
+  u8 *r = Pico_mcd->s68k_regs;\r
+\r
+  if ((a & 0x1f0) == 0x20)\r
+    goto write_comm;\r
+\r
+  switch (a) {\r
+    case 0x0e:\r
+      // special case, 2 byte writes would be handled differently\r
+      // TODO: verify\r
+      r[0xf] = d;\r
+      return;\r
+    case 0x58: // stamp data size\r
+      r[0x59] = d & 7;\r
+      return;\r
+    case 0x5a: // stamp map base address\r
+      r[0x5a] = d >> 8;\r
+      r[0x5b] = d & 0xe0;\r
+      return;\r
+    case 0x5c: // V cell size\r
+      r[0x5d] = d & 0x1f;\r
+      return;\r
+    case 0x5e: // image buffer start address\r
+      r[0x5e] = d >> 8;\r
+      r[0x5f] = d & 0xf8;\r
+      return;\r
+    case 0x60: // image buffer offset\r
+      r[0x61] = d & 0x3f;\r
+      return;\r
+    case 0x62: // h dot size\r
+      r[0x62] = (d >> 8) & 1;\r
+      r[0x63] = d;\r
+      return;\r
+    case 0x64: // v dot size\r
+      r[0x65] = d;\r
+      return;\r
+    case 0x66: // trace vector base address\r
+      d &= 0xfffe;\r
+      r[0x66] = d >> 8;\r
+      r[0x67] = d;\r
+      gfx_start(d);\r
+      return;\r
+    default:\r
+      break;\r
+  }\r
+\r
+  s68k_reg_write8(a,     d >> 8);\r
+  s68k_reg_write8(a + 1, d & 0xff);\r
+  return;\r
+\r
+write_comm:\r
+  r[a] = d >> 8;\r
+  r[a + 1] = d;\r
+  if (Pico_mcd->m.m68k_poll_cnt)\r
+    SekEndRunS68k(0);\r
+  Pico_mcd->m.m68k_poll_cnt = 0;\r
+}\r
+\r
 // -----------------------------------------------------------------\r
 //                          Main 68k\r
 // -----------------------------------------------------------------\r
@@ -811,9 +873,7 @@ static u32 PicoReadS68k8_pr(u32 a)
       s68k_poll_detect(a & ~1, d);\r
       goto regs_done;\r
     }\r
-    else if (a >= 0x58 && a < 0x68)\r
-         d = gfx_cd_read(a & ~1);\r
-    else d = s68k_reg_read16(a & ~1);\r
+    d = s68k_reg_read16(a & ~1);\r
     if (!(a & 1))\r
       d >>= 8;\r
 \r
@@ -830,13 +890,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
@@ -849,9 +906,7 @@ static u32 PicoReadS68k16_pr(u32 a)
   // regs\r
   if ((a & 0xfe00) == 0x8000) {\r
     a &= 0x1fe;\r
-    if (0x58 <= a && a < 0x68)\r
-         d = gfx_cd_read(a);\r
-    else d = s68k_reg_read16(a);\r
+    d = s68k_reg_read16(a);\r
 \r
     elprintf(EL_CDREGS, "s68k_regs r16: [%02x] %04x @%06x",\r
       a, d, SekPcS68k);\r
@@ -860,16 +915,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
@@ -882,9 +933,10 @@ static void PicoWriteS68k8_pr(u32 a, u32 d)
   if ((a & 0xfe00) == 0x8000) {\r
     a &= 0x1ff;\r
     elprintf(EL_CDREGS, "s68k_regs w8: [%02x] %02x @%06x", a, d, SekPcS68k);\r
-    if (0x58 <= a && a < 0x68)\r
-         gfx_cd_write16(a&~1, (d<<8)|d);\r
-    else s68k_reg_write8(a,d);\r
+    if (0x59 <= a && a < 0x68) // word regs\r
+      s68k_reg_write16(a & ~1, (d << 8) | d);\r
+    else\r
+      s68k_reg_write8(a, d);\r
     return;\r
   }\r
 \r
@@ -894,7 +946,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
@@ -907,18 +959,7 @@ static void PicoWriteS68k16_pr(u32 a, u32 d)
   if ((a & 0xfe00) == 0x8000) {\r
     a &= 0x1fe;\r
     elprintf(EL_CDREGS, "s68k_regs w16: [%02x] %04x @%06x", a, d, SekPcS68k);\r
-    if (a >= 0x58 && a < 0x68)\r
-      gfx_cd_write16(a, d);\r
-    else {\r
-      if (a == 0xe) {\r
-        // special case, 2 byte writes would be handled differently\r
-        // TODO: verify\r
-        Pico_mcd->s68k_regs[0xf] = d;\r
-        return;\r
-      }\r
-      s68k_reg_write8(a,     d >> 8);\r
-      s68k_reg_write8(a + 1, d & 0xff);\r
-    }\r
+    s68k_reg_write16(a, d);\r
     return;\r
   }\r
 \r
@@ -928,7 +969,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