basic psp snd + cz80

[picodrive.git] / Pico / Memory.c

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 963d30b..3c7b70c 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -69,7 +69,7 @@ static __inline int PicoMemBase(u32 pc)
 #endif\r
 \r
 \r
-static u32 CPU_CALL PicoCheckPc(u32 pc)\r
+static u32 PicoCheckPc(u32 pc)\r
 {\r
   u32 ret=0;\r
 #if defined(EMU_C68K)\r
@@ -315,7 +315,7 @@ static void OtherWrite8End(u32 a,u32 d,int realsize)
 //                     Read Rom and read Ram\r
 \r
 #ifndef _ASM_MEMORY_C\r
-PICO_INTERNAL_ASM u32 CPU_CALL PicoRead8(u32 a)\r
+PICO_INTERNAL_ASM u32 PicoRead8(u32 a)\r
 {\r
   u32 d=0;\r
 \r
@@ -351,7 +351,7 @@ end:
   return d;\r
 }\r
 \r
-PICO_INTERNAL_ASM u32 CPU_CALL PicoRead16(u32 a)\r
+PICO_INTERNAL_ASM u32 PicoRead16(u32 a)\r
 {\r
   u32 d=0;\r
 \r
@@ -387,7 +387,7 @@ end:
   return d;\r
 }\r
 \r
-PICO_INTERNAL_ASM u32 CPU_CALL PicoRead32(u32 a)\r
+PICO_INTERNAL_ASM u32 PicoRead32(u32 a)\r
 {\r
   u32 d=0;\r
 \r
@@ -426,7 +426,7 @@ end:
 //                            Write Ram\r
 \r
 #ifndef _ASM_MEMORY_C\r
-PICO_INTERNAL_ASM void CPU_CALL PicoWrite8(u32 a,u8 d)\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
@@ -446,7 +446,7 @@ PICO_INTERNAL_ASM void CPU_CALL PicoWrite8(u32 a,u8 d)
 }\r
 #endif\r
 \r
-void CPU_CALL PicoWrite16(u32 a,u16 d)\r
+void PicoWrite16(u32 a,u16 d)\r
 {\r
 #ifdef __debug_io\r
   dprintf("w16: %06x, %04x", a&0xffffff, d);\r
@@ -462,7 +462,7 @@ void CPU_CALL PicoWrite16(u32 a,u16 d)
   OtherWrite16(a,d);\r
 }\r
 \r
-static void CPU_CALL PicoWrite32(u32 a,u32 d)\r
+static void PicoWrite32(u32 a,u32 d)\r
 {\r
 #ifdef __debug_io\r
   dprintf("w32: %06x, %08x", a&0xffffff, d);\r
@@ -684,14 +684,11 @@ end:
   return ret;\r
 }\r
 \r
-PICO_INTERNAL unsigned short z80_read16(unsigned short a)\r
-{\r
-  //dprintf("z80_read16");\r
-\r
-  return (u16) ( (u16)z80_read(a) | ((u16)z80_read((u16)(a+1))<<8) );\r
-}\r
-\r
+#ifndef _USE_CZ80\r
 PICO_INTERNAL_ASM void z80_write(unsigned char data, unsigned short a)\r
+#else\r
+PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)\r
+#endif\r
 {\r
   //if (a<0x4000)\r
   //  dprintf("z80 w8 : %06x,   %02x @%04x", a, data, mz80GetRegisterValue(NULL, 0));\r
@@ -732,6 +729,14 @@ PICO_INTERNAL_ASM void z80_write(unsigned char data, unsigned short a)
   elprintf(EL_ANOMALY, "z80 invalid w8 [%06x] %02x", a, data);\r
 }\r
 \r
+#ifndef _USE_CZ80\r
+PICO_INTERNAL unsigned short z80_read16(unsigned short a)\r
+{\r
+  //dprintf("z80_read16");\r
+\r
+  return (u16) ( (u16)z80_read(a) | ((u16)z80_read((u16)(a+1))<<8) );\r
+}\r
+\r
 PICO_INTERNAL void z80_write16(unsigned short data, unsigned short a)\r
 {\r
   //dprintf("z80_write16");\r
@@ -739,4 +744,5 @@ PICO_INTERNAL void z80_write16(unsigned short data, unsigned short a)
   z80_write((unsigned char) data,a);\r
   z80_write((unsigned char)(data>>8),(u16)(a+1));\r
 }\r
+#endif\r
 \r