--- np2/i286x/memory.h	2004/03/04 16:58:57	1.7
+++ np2/i286x/memory.h	2005/02/07 14:46:11	1.9
@@ -46,20 +46,20 @@ enum {
 extern "C" {
 #endif
 
-extern	BYTE	mem[0x200000];
+extern	UINT8	mem[0x200000];
 
 void MEMCALL i286_memorymap(UINT type);
 void MEMCALL i286_romareamap(UINT16 map);
 void MEMCALL i286_vram_dispatch(UINT operate);
 
-BYTE MEMCALL i286_memoryread(UINT32 address);
+UINT8 MEMCALL i286_memoryread(UINT32 address);
 UINT16 MEMCALL i286_memoryread_w(UINT32 address);
-void MEMCALL i286_memorywrite(UINT32 address, BYTE value);
+void MEMCALL i286_memorywrite(UINT32 address, UINT8 value);
 void MEMCALL i286_memorywrite_w(UINT32 address, UINT16 value);
 
-BYTE MEMCALL i286_membyte_read(UINT seg, UINT off);
+UINT8 MEMCALL i286_membyte_read(UINT seg, UINT off);
 UINT16 MEMCALL i286_memword_read(UINT seg, UINT off);
-void MEMCALL i286_membyte_write(UINT seg, UINT off, BYTE value);
+void MEMCALL i286_membyte_write(UINT seg, UINT off, UINT8 value);
 void MEMCALL i286_memword_write(UINT seg, UINT off, UINT16 value);
 
 void MEMCALL i286_memstr_read(UINT seg, UINT off, void *dat, UINT leng);
@@ -83,7 +83,7 @@ void MEMCALL i286_memx_write(UINT32 addr
 #define	MEML_READ8(seg, off)				\
 			i286_membyte_read((seg), (off))
 #define	MEML_READ16(seg, off)				\
-			i286_memwrite_read((seg), (off))
+			i286_memword_read((seg), (off))
 #define	MEML_WRITE8(seg, off, dat)			\
 			i286_membyte_write((seg), (off), (dat));
 #define	MEML_WRITE16(seg, off, dat)			\