--- xmil/z80c/z80mem.h	2004/08/08 06:59:22	1.2
+++ xmil/z80c/z80mem.h	2004/08/14 12:16:18	1.5
@@ -8,10 +8,14 @@
 extern "C" {
 #endif
 
-REG8 MEMCALL Z80_RDMEM(REG16 addr);
-void MEMCALL Z80_WRMEM(REG16 addr, REG8 value);
-REG16 MEMCALL Z80_RDMEM_W(REG16 addr);
-void MEMCALL Z80_WRMEM_W(REG16 addr, REG16 value);
+REG8 MEMCALL mem_read8(UINT addr);
+REG16 MEMCALL mem_read16(UINT addr);
+void MEMCALL mem_write8(UINT addr, REG8 value);
+void MEMCALL mem_write16(UINT addr, REG16 value);
+SINT MEMCALL mem_read8s(UINT addr);
+
+#define	z80mem_read8(a)			mem_read8(a)
+#define	z80mem_write8(a, v)		mem_write8(a, v)
 
 #ifdef __cplusplus
 }