Cyclone poll detection problem fixed

[picodrive.git] / Pico / Memory.c

diff --git a/Pico/Memory.c b/Pico/Memory.c
index ecc34c2..8dc11bb 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -1,14 +1,12 @@
 // This is part of Pico Library\r
 \r
 // (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006 notaz, All rights reserved.\r
+// (c) Copyright 2006,2007 notaz, All rights reserved.\r
 // Free for non-commercial use.\r
 \r
 // For commercial use, separate licencing terms must be obtained.\r
 \r
 \r
-//#define __debug_io\r
-\r
 #include "PicoInt.h"\r
 \r
 #include "sound/ym2612.h"\r
@@ -357,9 +355,7 @@ PICO_INTERNAL_ASM u32 PicoRead8(u32 a)
   if ((a&1)==0) d>>=8;\r
 \r
 end:\r
-#ifdef __debug_io\r
-  dprintf("r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   if (a>=Pico.romsize) {\r
     lastread_a = a;\r
@@ -394,9 +390,7 @@ PICO_INTERNAL_ASM u32 PicoRead16(u32 a)
   else d = OtherRead16(a, 16);\r
 \r
 end:\r
-#ifdef __debug_io\r
-  dprintf("r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   if (a>=Pico.romsize) {\r
     lastread_a = a;\r
@@ -429,9 +423,7 @@ PICO_INTERNAL_ASM u32 PicoRead32(u32 a)
   else d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32);\r
 \r
 end:\r
-#ifdef __debug_io\r
-  dprintf("r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   if (a>=Pico.romsize) {\r
     lastread_a = a;\r
@@ -448,9 +440,7 @@ end:
 #if !defined(_ASM_MEMORY_C) || defined(_ASM_MEMORY_C_AMIPS)\r
 PICO_INTERNAL_ASM void PicoWrite8(u32 a,u8 d)\r
 {\r
-#ifdef __debug_io\r
-  dprintf("w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   lastwrite_cyc_d[lwp_cyc++&15] = d;\r
 #endif\r
@@ -465,9 +455,7 @@ PICO_INTERNAL_ASM void PicoWrite8(u32 a,u8 d)
 \r
 void PicoWrite16(u32 a,u16 d)\r
 {\r
-#ifdef __debug_io\r
-  dprintf("w16: %06x, %04x", a&0xffffff, d);\r
-#endif\r
+  elprintf(EL_IO, "w16: %06x, %04x", a&0xffffff, d);\r
 #ifdef EMU_CORE_DEBUG\r
   lastwrite_cyc_d[lwp_cyc++&15] = d;\r
 #endif\r
@@ -482,9 +470,7 @@ void PicoWrite16(u32 a,u16 d)
 \r
 static void PicoWrite32(u32 a,u32 d)\r
 {\r
-#ifdef __debug_io\r
-  dprintf("w32: %06x, %08x", a&0xffffff, d);\r
-#endif\r
+  elprintf(EL_IO, "w32: %06x, %08x", a&0xffffff, d);\r
 #ifdef EMU_CORE_DEBUG\r
   lastwrite_cyc_d[lwp_cyc++&15] = d;\r
 #endif\r
@@ -607,9 +593,7 @@ unsigned int m68k_read_memory_8(unsigned int a)
   if (a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k)\r
        d = *(u8 *) (Pico.rom+(a^1));\r
   else d = (u8) lastread_d[lrp_mus++&15];\r
-#ifdef __debug_io\r
-  dprintf("r8_mu : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r8_mu : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
   return d;\r
 }\r
 unsigned int m68k_read_memory_16(unsigned int a)\r
@@ -618,9 +602,7 @@ unsigned int m68k_read_memory_16(unsigned int a)
   if (a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k)\r
        d = *(u16 *)(Pico.rom+(a&~1));\r
   else d = (u16) lastread_d[lrp_mus++&15];\r
-#ifdef __debug_io\r
-  dprintf("r16_mu: %06x, %04x @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r16_mu: %06x, %04x @%06x", a&0xffffff, d, SekPc);\r
   return d;\r
 }\r
 unsigned int m68k_read_memory_32(unsigned int a)\r
@@ -630,9 +612,7 @@ unsigned int m68k_read_memory_32(unsigned int a)
        { u16 *pm=(u16 *)(Pico.rom+(a&~1));d=(pm[0]<<16)|pm[1]; }\r
   else if (a <= 0x78) d = m68k_read_32(a, 0);\r
   else d = lastread_d[lrp_mus++&15];\r
-#ifdef __debug_io\r
-  dprintf("r32_mu: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r32_mu: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
   return d;\r
 }\r
 \r