X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=pico%2Fcd%2Fmemory.c;h=1d844dad03b8e7d5fad0c6dfaf02095fb99df1c0;hb=fa8fb7544593a0ed43f3354cc5f41150464b55bf;hp=4b4c18f807862ca93c709df164755c618ca717b0;hpb=cc5ffc3cbe03715710a2adf6a8829f082fa7a819;p=picodrive.git

diff --git a/pico/cd/memory.c b/pico/cd/memory.c
index 4b4c18f..1d844da 100644
--- a/pico/cd/memory.c
+++ b/pico/cd/memory.c
@@ -28,11 +28,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);
@@ -70,14 +65,15 @@ static void remap_word_ram(u32 r3);
 
 // poller detection
 #define POLL_LIMIT 16
-#define POLL_CYCLES 124
+#define POLL_CYCLES 64
 
 void m68k_comm_check(u32 a)
 {
   pcd_sync_s68k(SekCyclesDone(), 0);
-  if (a != Pico_mcd->m.m68k_poll_a) {
+  if (SekNotPolling || a != Pico_mcd->m.m68k_poll_a) {
     Pico_mcd->m.m68k_poll_a = a;
     Pico_mcd->m.m68k_poll_cnt = 0;
+    SekNotPolling = 0;
     return;
   }
   Pico_mcd->m.m68k_poll_cnt++;
@@ -143,9 +139,6 @@ void m68k_reg_write8(u32 a, u32 d)
   u32 dold;
   a &= 0x3f;
 
-  Pico_mcd->m.m68k_poll_a =
-  Pico_mcd->m.m68k_poll_cnt = 0;
-
   switch (a) {
     case 0:
       d &= 1;
@@ -230,18 +223,17 @@ write_comm:
   if (d == Pico_mcd->s68k_regs[a])
     return;
 
-  Pico_mcd->s68k_regs[a] = d;
   pcd_sync_s68k(SekCyclesDone(), 0);
-  if (Pico_mcd->m.s68k_poll_a == a && Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT) {
+  Pico_mcd->s68k_regs[a] = d;
+  if (Pico_mcd->m.s68k_poll_a == (a & ~1)
+      && Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT)
+  {
     SekSetStopS68k(0);
     Pico_mcd->m.s68k_poll_a = 0;
     elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);
   }
 }
 
-#ifndef _ASM_CD_MEMORY_C
-static
-#endif
 u32 s68k_poll_detect(u32 a, u32 d)
 {
 #ifdef USE_POLL_DETECT
@@ -250,7 +242,7 @@ u32 s68k_poll_detect(u32 a, u32 d)
     return d;
 
   cycles = SekCyclesDoneS68k();
-  if (a == Pico_mcd->m.s68k_poll_a) {
+  if (!SekNotPolling && a == Pico_mcd->m.s68k_poll_a) {
     u32 clkdiff = cycles - Pico_mcd->m.s68k_poll_clk;
     if (clkdiff <= POLL_CYCLES) {
       cnt = Pico_mcd->m.s68k_poll_cnt + 1;
@@ -265,6 +257,7 @@ u32 s68k_poll_detect(u32 a, u32 d)
   Pico_mcd->m.s68k_poll_a = a;
   Pico_mcd->m.s68k_poll_clk = cycles;
   Pico_mcd->m.s68k_poll_cnt = cnt;
+  SekNotPollingS68k = 0;
 #endif
   return d;
 }
@@ -555,18 +548,20 @@ static void PicoWriteM68k8_ramc(u32 a, u32 d)
     return;
   }
 
-  elprintf(EL_UIO, "m68k unmapped w8  [%06x]   %02x @%06x", a, d & 0xff, SekPc);
+  elprintf(EL_UIO, "m68k unmapped w8  [%06x]   %02x @%06x",
+    a, d & 0xff, SekPc);
 }
 
 static void PicoWriteM68k16_ramc(u32 a, u32 d)
 {
-  elprintf(EL_ANOMALY, "ramcart w16: [%06x] %04x @%06x", a, d, SekPcS68k);
+  elprintf(EL_ANOMALY, "ramcart w16: [%06x] %04x @%06x",
+    a, d, SekPcS68k);
   PicoWriteM68k8_ramc(a + 1, 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
@@ -574,7 +569,8 @@ static u32 PicoReadM68k8_io(u32 a)
     if (!(a & 1))
       d >>= 8;
     d &= 0xff;
-    elprintf(EL_CDREGS, "m68k_regs r8:  [%02x]   %02x @%06x", a & 0x3f, d, SekPc);
+    elprintf(EL_CDREGS, "m68k_regs r8:  [%02x]   %02x @%06x",
+      a & 0x3f, d, SekPc);
     return d;
   }
 
@@ -582,22 +578,24 @@ 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) {
     d = m68k_reg_read16(a);
-    elprintf(EL_CDREGS, "m68k_regs r16: [%02x] %04x @%06x", a & 0x3f, d, SekPc);
+    elprintf(EL_CDREGS, "m68k_regs r16: [%02x] %04x @%06x",
+      a & 0x3f, d, SekPc);
     return d;
   }
 
   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", a&0x3f, d, SekPc);
+    elprintf(EL_CDREGS, "m68k_regs w8:  [%02x]   %02x @%06x",
+      a & 0x3f, d, SekPc);
     m68k_reg_write8(a, d);
     return;
   }
@@ -605,10 +603,11 @@ 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", a&0x3f, d, SekPc);
+    elprintf(EL_CDREGS, "m68k_regs w16: [%02x] %04x @%06x",
+      a & 0x3f, d, SekPc);
 
     m68k_reg_write8(a,     d >> 8);
     if ((a & 0x3e) != 0x0e) // special case
@@ -638,12 +637,14 @@ static u32 s68k_unmapped_read16(u32 a)
 
 static void s68k_unmapped_write8(u32 a, u32 d)
 {
-  elprintf(EL_UIO, "s68k unmapped w8  [%06x]   %02x @%06x", a, d & 0xff, SekPc);
+  elprintf(EL_UIO, "s68k unmapped w8  [%06x]   %02x @%06x",
+    a, d & 0xff, SekPc);
 }
 
 static void s68k_unmapped_write16(u32 a, u32 d)
 {
-  elprintf(EL_UIO, "s68k unmapped w16 [%06x] %04x @%06x", a, d & 0xffff, SekPc);
+  elprintf(EL_UIO, "s68k unmapped w16 [%06x] %04x @%06x",
+    a, d & 0xffff, SekPc);
 }
 
 // PRG RAM protected range (000000 - 01fdff)?
@@ -807,7 +808,7 @@ static u32 PicoReadS68k8_pr(u32 a)
     a &= 0x1ff;
     if (a >= 0x0e && a < 0x30) {
       d = Pico_mcd->s68k_regs[a];
-      s68k_poll_detect(a, d);
+      s68k_poll_detect(a & ~1, d);
       goto regs_done;
     }
     else if (a >= 0x58 && a < 0x68)
@@ -1051,10 +1052,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);