cd: fix breakage in comm detection

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

diff --git a/pico/cd/memory.c b/pico/cd/memory.c
index 1064b91..4b4c18f 100644 (file)
--- a/pico/cd/memory.c
+++ b/pico/cd/memory.c
@@ -72,16 +72,15 @@ static void remap_word_ram(u32 r3);
 #define POLL_LIMIT 16\r
 #define POLL_CYCLES 124\r
 \r
-u32 m68k_comm_check(u32 a, u32 d)\r
+void m68k_comm_check(u32 a)\r
 {\r
   pcd_sync_s68k(SekCyclesDone(), 0);\r
   if (a != Pico_mcd->m.m68k_poll_a) {\r
     Pico_mcd->m.m68k_poll_a = a;\r
     Pico_mcd->m.m68k_poll_cnt = 0;\r
-    return d;\r
+    return;\r
   }\r
   Pico_mcd->m.m68k_poll_cnt++;\r
-  return d;\r
 }\r
 \r
 #ifndef _ASM_CD_MEMORY_C\r
@@ -97,9 +96,10 @@ static u32 m68k_reg_read16(u32 a)
         | Pico_mcd->m.busreq;\r
       goto end;\r
     case 2:\r
+      m68k_comm_check(a);\r
       d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0xc7);\r
       elprintf(EL_CDREG3, "m68k_regs r3: %02x @%06x", (u8)d, SekPc);\r
-      goto end_comm;\r
+      goto end;\r
     case 4:\r
       d = Pico_mcd->s68k_regs[4]<<8;\r
       goto end;\r
@@ -123,17 +123,15 @@ static u32 m68k_reg_read16(u32 a)
 \r
   if (a < 0x30) {\r
     // comm flag/cmd/status (0xE-0x2F)\r
+    m68k_comm_check(a);\r
     d = (Pico_mcd->s68k_regs[a]<<8) | Pico_mcd->s68k_regs[a+1];\r
-    goto end_comm;\r
+    goto end;\r
   }\r
 \r
   elprintf(EL_UIO, "m68k_regs FIXME invalid read @ %02x", a);\r
 \r
 end:\r
   return d;\r
-\r
-end_comm:\r
-  return m68k_comm_check(a, d);\r
 }\r
 #endif\r
 \r
@@ -259,7 +257,7 @@ u32 s68k_poll_detect(u32 a, u32 d)
       //printf("-- diff: %u, cnt = %i\n", clkdiff, cnt);\r
       if (Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT) {\r
         SekSetStopS68k(1);\r
-        elprintf(EL_CDPOLL, "s68k poll detected @ %06x, a=%02x",\r
+        elprintf(EL_CDPOLL, "s68k poll detected @%06x, a=%02x",\r
           SekPcS68k, a);\r
       }\r
     }\r
@@ -820,7 +818,7 @@ static u32 PicoReadS68k8_pr(u32 a)
 \r
 regs_done:\r
     d &= 0xff;\r
-    elprintf(EL_CDREGS, "s68k_regs r8: [%02x] %02x @ %06x",\r
+    elprintf(EL_CDREGS, "s68k_regs r8: [%02x] %02x @%06x",\r
       a, d, SekPcS68k);\r
     return d;\r
   }\r
@@ -854,7 +852,7 @@ static u32 PicoReadS68k16_pr(u32 a)
          d = gfx_cd_read(a);\r
     else d = s68k_reg_read16(a);\r
 \r
-    elprintf(EL_CDREGS, "s68k_regs r16: [%02x] %04x @ %06x",\r
+    elprintf(EL_CDREGS, "s68k_regs r16: [%02x] %04x @%06x",\r
       a, d, SekPcS68k);\r
     return d;\r
   }\r
@@ -882,7 +880,7 @@ static void PicoWriteS68k8_pr(u32 a, u32 d)
   // regs\r
   if ((a & 0xfe00) == 0x8000) {\r
     a &= 0x1ff;\r
-    elprintf(EL_CDREGS, "s68k_regs w8: [%02x] %02x @ %06x", a, d, SekPcS68k);\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
@@ -907,7 +905,7 @@ static void PicoWriteS68k16_pr(u32 a, u32 d)
   // regs\r
   if ((a & 0xfe00) == 0x8000) {\r
     a &= 0x1fe;\r
-    elprintf(EL_CDREGS, "s68k_regs w16: [%02x] %04x @ %06x", a, d, SekPcS68k);\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