--- np2/i286a/memory.c	2003/12/22 01:44:59	1.7
+++ np2/i286a/memory.c	2005/03/18 09:23:10	1.9
@@ -1,73 +1,15 @@
 #include	"compiler.h"
 #include	"cpucore.h"
-#include	"egcmem.h"
-#include	"pccore.h"
-#include	"iocore.h"
-#include	"vram.h"
-#include	"font.h"
 
 #define	USE_HIMEM		0x110000
 
-
-REG8 MEMCALL i286_membyte_read(UINT seg, UINT off) {
-
-	UINT32	address;
-
-	address = (seg << 4) + LOW16(off);
-	if (address < I286_MEMREADMAX) {
-		return(mem[address]);
-	}
-	else {
-		return(i286_memoryread(address));
-	}
-}
-
-REG16 MEMCALL i286_memword_read(UINT seg, UINT off) {
-
-	UINT32	address;
-
-	address = (seg << 4) + LOW16(off);
-	if (address < (I286_MEMREADMAX - 1)) {
-		return(LOADINTELWORD(mem + address));
-	}
-	else {
-		return(i286_memoryread_w(address));
-	}
-}
-
-void MEMCALL i286_membyte_write(UINT seg, UINT off, REG8 value) {
-
-	UINT32	address;
-
-	address = (seg << 4) + LOW16(off);
-	if (address < I286_MEMWRITEMAX) {
-		mem[address] = (BYTE)value;
-	}
-	else {
-		i286_memorywrite(address, value);
-	}
-}
-
-void MEMCALL i286_memword_write(UINT seg, UINT off, REG16 value) {
-
-	UINT32	address;
-
-	address = (seg << 4) + LOW16(off);
-	if (address < (I286_MEMWRITEMAX - 1)) {
-		STOREINTELWORD(mem + address, value);
-	}
-	else {
-		i286_memorywrite_w(address, value);
-	}
-}
-
 void MEMCALL i286_memstr_read(UINT seg, UINT off, void *dat, UINT leng) {
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT32	adrs;
 	UINT	size;
 
-	out = (BYTE *)dat;
+	out = (UINT8 *)dat;
 	adrs = seg << 4;
 	off = LOW16(off);
 	if ((I286_MEMREADMAX >= 0x10000) &&
@@ -102,11 +44,11 @@ void MEMCALL i286_memstr_read(UINT seg, 
 void MEMCALL i286_memstr_write(UINT seg, UINT off,
 												const void *dat, UINT leng) {
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT32	adrs;
 	UINT	size;
 
-	out = (BYTE *)dat;
+	out = (UINT8 *)dat;
 	adrs = seg << 4;
 	off = LOW16(off);
 	if ((I286_MEMWRITEMAX >= 0x10000) &&
@@ -144,7 +86,7 @@ void MEMCALL i286_memx_read(UINT32 addre
 		CopyMemory(dat, mem + address, leng);
 	}
 	else {
-		BYTE *out = (BYTE *)dat;
+		UINT8 *out = (UINT8 *)dat;
 		if (address < I286_MEMREADMAX) {
 			CopyMemory(out, mem + address, I286_MEMREADMAX - address);
 			out += I286_MEMREADMAX - address;
@@ -159,13 +101,13 @@ void MEMCALL i286_memx_read(UINT32 addre
 
 void MEMCALL i286_memx_write(UINT32 address, const void *dat, UINT leng) {
 
-const BYTE	*out;
+const UINT8	*out;
 
 	if ((address + leng) < I286_MEMWRITEMAX) {
 		CopyMemory(mem + address, dat, leng);
 	}
 	else {
-		out = (BYTE *)dat;
+		out = (UINT8 *)dat;
 		if (address < I286_MEMWRITEMAX) {
 			CopyMemory(mem + address, out, I286_MEMWRITEMAX - address);
 			out += I286_MEMWRITEMAX - address;