cd: fix copy-paste bug, comm issue

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

diff --git a/pico/cd/memory.c b/pico/cd/memory.c
index 2c53b33..b0f5e4a 100644 (file)
--- a/pico/cd/memory.c
+++ b/pico/cd/memory.c
@@ -222,12 +222,13 @@ write_comm:
 \r
   pcd_sync_s68k(SekCyclesDone(), 0);\r
   Pico_mcd->s68k_regs[a] = d;\r
-  if (Pico_mcd->m.s68k_poll_a == (a & ~1)\r
-      && Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT)\r
+  if (Pico_mcd->m.s68k_poll_a == (a & ~1))\r
   {\r
-    SekSetStopS68k(0);\r
+    if (Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT) {\r
+      elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);\r
+      SekSetStopS68k(0);\r
+    }\r
     Pico_mcd->m.s68k_poll_a = 0;\r
-    elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);\r
   }\r
 }\r
 \r
@@ -662,7 +663,7 @@ void PicoWrite8_mcd_io(u32 a, u32 d)
     return;\r
   }\r
 \r
-  PicoWrite16_io(a, d);\r
+  PicoWrite8_io(a, d);\r
 }\r
 \r
 void PicoWrite16_mcd_io(u32 a, u32 d)\r
@@ -671,7 +672,7 @@ void PicoWrite16_mcd_io(u32 a, u32 d)
     elprintf(EL_CDREGS, "m68k_regs w16: [%02x] %04x @%06x",\r
       a & 0x3f, d, SekPc);\r
 \r
-    m68k_reg_write8(a,     d >> 8);\r
+    m68k_reg_write8(a, d >> 8);\r
     if ((a & 0x3e) != 0x0e) // special case\r
       m68k_reg_write8(a + 1, d & 0xff);\r
     return;\r