--- np2/i286c/memory.h	2004/01/25 05:41:28	1.9
+++ np2/i286c/memory.h	2004/03/07 23:04:51	1.11
@@ -54,17 +54,44 @@ REG16 MEMCALL i286_memoryread_w(UINT32 a
 void MEMCALL i286_memorywrite(UINT32 address, REG8 value);
 void MEMCALL i286_memorywrite_w(UINT32 address, REG16 value);
 
-REG8 MEMCALL i286_membyte_read(UINT seg, UINT off);
-REG16 MEMCALL i286_memword_read(UINT seg, UINT off);
-void MEMCALL i286_membyte_write(UINT seg, UINT off, REG8 value);
-void MEMCALL i286_memword_write(UINT seg, UINT off, REG16 value);
-
-void MEMCALL i286_memstr_read(UINT seg, UINT off, void *dat, UINT leng);
-void MEMCALL i286_memstr_write(UINT seg, UINT off,
-												const void *dat, UINT leng);
+REG8 MEMCALL meml_read8(UINT seg, UINT off);
+REG16 MEMCALL meml_read16(UINT seg, UINT off);
+void MEMCALL meml_write8(UINT seg, UINT off, REG8 value);
+void MEMCALL meml_write16(UINT seg, UINT off, REG16 value);
 
-void MEMCALL i286_memx_read(UINT32 address, void *dat, UINT leng);
-void MEMCALL i286_memx_write(UINT32 address, const void *dat, UINT leng);
+void MEMCALL meml_readstr(UINT seg, UINT off, void *dat, UINT leng);
+void MEMCALL meml_writestr(UINT seg, UINT off, const void *dat, UINT leng);
+
+void MEMCALL meml_read(UINT32 address, void *dat, UINT leng);
+void MEMCALL meml_write(UINT32 address, const void *dat, UINT leng);
+
+
+// ---- Physical Space (DMA)
+
+#define	MEMP_READ8(addr)					\
+			i286_memoryread((addr))
+#define	MEMP_WRITE8(addr, dat)				\
+			i286_memorywrite((addr), (dat))
+
+
+// ---- Logical Space (BIOS)
+
+#define	MEML_READ8(seg, off)				\
+			meml_read8((seg), (off))
+#define	MEML_READ16(seg, off)				\
+			meml_read16((seg), (off))
+#define	MEML_WRITE8(seg, off, dat)			\
+			meml_write8((seg), (off), (dat));
+#define	MEML_WRITE16(seg, off, dat)			\
+			meml_write16((seg), (off), (dat));
+#define MEML_READSTR(seg, off, dat, leng)	\
+			meml_readstr((seg), (off), (dat), (leng))
+#define MEML_WRITESTR(seg, off, dat, leng)	\
+			meml_writestr((seg), (off), (dat), (leng))
+#define MEML_READ(addr, dat, leng)			\
+			meml_read((addr), (dat), (leng))
+#define MEML_WRITE(addr, dat, leng)			\
+			meml_write((addr), (dat), (leng))
 
 #ifdef __cplusplus
 }