X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FMemory.c;h=66719a8c50800bcb10de3c56b0bc30b79e0b39ba;hb=689fb2c0898deb6f87006dc5755516eb0ff6e647;hp=b919ee8801bd648c4f07bfc994513d6b36fc06b8;hpb=ca61ee42d9298aeb5a5c97d9addaa1832af41d67;p=picodrive.git diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c index b919ee8..66719a8 100644 --- a/Pico/cd/Memory.c +++ b/Pico/cd/Memory.c @@ -141,7 +141,7 @@ void m68k_reg_write8(u32 a, u32 d) #ifdef USE_POLL_DETECT if ((s68k_poll_adclk&0xfe) == 2 && s68k_poll_cnt > POLL_LIMIT) { SekSetStopS68k(0); s68k_poll_adclk = 0; - elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a); + elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a); } #endif return; @@ -161,7 +161,7 @@ void m68k_reg_write8(u32 a, u32 d) #ifdef USE_POLL_DETECT if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) { SekSetStopS68k(0); s68k_poll_adclk = 0; - elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a); + elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a); } #endif return; @@ -172,7 +172,7 @@ void m68k_reg_write8(u32 a, u32 d) #ifdef USE_POLL_DETECT if ((a&0xfe) == (s68k_poll_adclk&0xfe) && s68k_poll_cnt > POLL_LIMIT) { SekSetStopS68k(0); s68k_poll_adclk = 0; - elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a); + elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a); } #endif return; @@ -197,7 +197,7 @@ u32 s68k_poll_detect(u32 a, u32 d) //printf("-- diff: %u, cnt = %i\n", clkdiff, s68k_poll_cnt); if (s68k_poll_cnt > POLL_LIMIT) { SekSetStopS68k(1); - elprintf(EL_CDPOLL, "s68k poll detected @ %06x, a=%02x\n", SekPcS68k, a); + elprintf(EL_CDPOLL, "s68k poll detected @ %06x, a=%02x", SekPcS68k, a); } s68k_poll_adclk = (SekCyclesDoneS68k() << 8) | a; return d; @@ -808,7 +808,7 @@ static void PicoWriteM68k16(u32 a,u16 d) #ifdef USE_POLL_DETECT if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) { SekSetStopS68k(0); s68k_poll_adclk = 0; - elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a); + elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a); } #endif return; @@ -1626,6 +1626,10 @@ void PicoMemResetCD(int r3) PICO_INTERNAL void PicoMemSetupCD(void) { + // additional handlers for common code + PicoRead16Hook = OtherRead16End; + PicoWrite8Hook = OtherWrite8End; + #ifdef EMU_C68K // Setup m68k memory callbacks: PicoCpuCM68k.checkpc=PicoCheckPcM68k;