asm code updated, Bass Masters fix

[picodrive.git] / Pico / cd / Memory.c

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index 66719a8..2d08fd4 100644 (file)
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -376,11 +376,11 @@ void s68k_reg_write8(u32 a, u32 d)
 }\r
 \r
 \r
-#ifndef _ASM_CD_MEMORY_C\r
 static u32 OtherRead16End(u32 a, int realsize)\r
 {\r
   u32 d=0;\r
 \r
+#ifndef _ASM_CD_MEMORY_C\r
   if ((a&0xffffc0)==0xa12000) {\r
     d=m68k_reg_read16(a);\r
     goto end;\r
@@ -403,16 +403,20 @@ static u32 OtherRead16End(u32 a, int realsize)
     d=Pico_mcd->m.bcram_reg;\r
     goto end;\r
   }\r
+#endif\r
 \r
   elprintf(EL_UIO, "m68k FIXME: unusual r%i: %06x @%06x", realsize&~1, (a&0xfffffe)+(realsize&1), SekPc);\r
 \r
+#ifndef _ASM_CD_MEMORY_C\r
 end:\r
+#endif\r
   return d;\r
 }\r
 \r
 \r
 static void OtherWrite8End(u32 a, u32 d, int realsize)\r
 {\r
+#ifndef _ASM_CD_MEMORY_C\r
   if ((a&0xffffc0)==0xa12000) { m68k_reg_write8(a, d); return; }\r
 \r
   if ((a&0xfe0000)==0x600000) {\r
@@ -427,15 +431,17 @@ static void OtherWrite8End(u32 a, u32 d, int realsize)
     Pico_mcd->m.bcram_reg=d;\r
     return;\r
   }\r
+#endif\r
 \r
   elprintf(EL_UIO, "m68k FIXME: strange w%i: [%06x], %08x @%06x", realsize, a&0xffffff, d, SekPc);\r
 }\r
 \r
+#ifndef _ASM_CD_MEMORY_C\r
 #define _CD_MEMORY_C\r
 #undef _ASM_MEMORY_C\r
 #include "../MemoryCmn.c"\r
 #include "cell_map.c"\r
-#endif // !def _ASM_CD_MEMORY_C\r
+#endif\r
 \r
 \r
 // -----------------------------------------------------------------\r