split memories away from Pico

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

diff --git a/pico/cd/memory.c b/pico/cd/memory.c
index 0551078..94b81b7 100644 (file)
--- a/pico/cd/memory.c
+++ b/pico/cd/memory.c
@@ -67,6 +67,12 @@ static void remap_word_ram(u32 r3);
 void m68k_comm_check(u32 a)\r
 {\r
   pcd_sync_s68k(SekCyclesDone(), 0);\r
+  if (a >= 0x0e && !Pico_mcd->m.need_sync) {\r
+    // there are cases when slave updates comm and only switches RAM\r
+    // over after that (mcd1b), so there must be a resync..\r
+    SekEndRun(64);\r
+    Pico_mcd->m.need_sync = 1;\r
+  }\r
   if (SekNotPolling || a != Pico_mcd->m.m68k_poll_a) {\r
     Pico_mcd->m.m68k_poll_a = a;\r
     Pico_mcd->m.m68k_poll_cnt = 0;\r
@@ -379,7 +385,7 @@ void s68k_reg_write8(u32 a, u32 d)
       //dprintf("s68k CDC reg addr: %x", d&0xf);\r
       break;\r
     case 7:\r
-      cdc_reg_w(d);\r
+      cdc_reg_w(d & 0xff);\r
       return;\r
     case 0xa:\r
       elprintf(EL_CDREGS, "s68k set CDC dma addr");\r
@@ -596,14 +602,14 @@ static u32 PicoReadM68k8_ramc(u32 a)
 {\r
   u32 d = 0;\r
   if (a == 0x400001) {\r
-    if (SRam.data != NULL)\r
+    if (Pico.sv.data != NULL)\r
       d = 3; // 64k cart\r
     return d;\r
   }\r
 \r
   if ((a & 0xfe0000) == 0x600000) {\r
-    if (SRam.data != NULL)\r
-      d = SRam.data[((a >> 1) & 0xffff) + 0x2000];\r
+    if (Pico.sv.data != NULL)\r
+      d = Pico.sv.data[((a >> 1) & 0xffff) + 0x2000];\r
     return d;\r
   }\r
 \r
@@ -623,9 +629,9 @@ static u32 PicoReadM68k16_ramc(u32 a)
 static void PicoWriteM68k8_ramc(u32 a, u32 d)\r
 {\r
   if ((a & 0xfe0000) == 0x600000) {\r
-    if (SRam.data != NULL && (Pico_mcd->m.bcram_reg & 1)) {\r
-      SRam.data[((a>>1) & 0xffff) + 0x2000] = d;\r
-      SRam.changed = 1;\r
+    if (Pico.sv.data != NULL && (Pico_mcd->m.bcram_reg & 1)) {\r
+      Pico.sv.data[((a>>1) & 0xffff) + 0x2000] = d;\r
+      Pico.sv.changed = 1;\r
     }\r
     return;\r
   }\r
@@ -871,7 +877,7 @@ static u32 PicoReadS68k16_bram(u32 a)
 static void PicoWriteS68k8_bram(u32 a, u32 d)\r
 {\r
   Pico_mcd->bram[(a >> 1) & 0x1fff] = d;\r
-  SRam.changed = 1;\r
+  Pico.sv.changed = 1;\r
 }\r
 \r
 static void PicoWriteS68k16_bram(u32 a, u32 d)\r
@@ -880,7 +886,7 @@ static void PicoWriteS68k16_bram(u32 a, u32 d)
   a = (a >> 1) & 0x1fff;\r
   Pico_mcd->bram[a++] = d;\r
   Pico_mcd->bram[a++] = d >> 8; // TODO: verify..\r
-  SRam.changed = 1;\r
+  Pico.sv.changed = 1;\r
 }\r
 \r
 #ifndef _ASM_CD_MEMORY_C\r
@@ -1065,23 +1071,6 @@ static void remap_word_ram(u32 r3)
     cpu68k_map_set(s68k_write8_map,  0x080000, 0x0bffff, s68k_dec_write8[b0 ^ 1][m], 1);\r
     cpu68k_map_set(s68k_write16_map, 0x080000, 0x0bffff, s68k_dec_write16[b0 ^ 1][m], 1);\r
   }\r
-\r
-#ifdef EMU_F68K\r
-  // update fetchmap..\r
-  int i;\r
-  if (!(r3 & 4))\r
-  {\r
-    for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x240000; i++)\r
-      PicoCpuFM68k.Fetch[i] = (unsigned long)Pico_mcd->word_ram2M - 0x200000;\r
-  }\r
-  else\r
-  {\r
-    for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x220000; i++)\r
-      PicoCpuFM68k.Fetch[i] = (unsigned long)Pico_mcd->word_ram1M[r3 & 1] - 0x200000;\r
-    for (i = M68K_FETCHBANK1*0x0c/0x100; (i<<(24-FAMEC_FETCHBITS)) < 0x0e0000; i++)\r
-      PicoCpuFS68k.Fetch[i] = (unsigned long)Pico_mcd->word_ram1M[(r3&1)^1] - 0x0c0000;\r
-  }\r
-#endif\r
 }\r
 \r
 void pcd_state_loaded_mem(void)\r
@@ -1186,7 +1175,7 @@ PICO_INTERNAL void PicoMemSetupCD(void)
       PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom;\r
     // .. and RAM\r
     for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++)\r
-      PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.ram - (i<<(24-FAMEC_FETCHBITS));\r
+      PicoCpuFM68k.Fetch[i] = (unsigned long)PicoMem.ram - (i<<(24-FAMEC_FETCHBITS));\r
     // S68k\r
     // PRG RAM is default\r
     for (i = 0; i < M68K_FETCHBANK1; i++)\r