--- np2/i286x/i286x.cpp	2004/08/03 10:11:37	1.22
+++ np2/i286x/i286x.cpp	2005/02/12 12:13:58	1.24
@@ -11,12 +11,12 @@
 #include	"i286xea.mcr"
 #include	"v30patch.h"
 #include	"bios.h"
-#include	"dmap.h"
+#include	"dmax86.h"
 
 
 	I286CORE	i286core;
 
-const BYTE iflags[256] = {					// Z_FLAG, S_FLAG, P_FLAG
+const UINT8 iflags[256] = {					// Z_FLAG, S_FLAG, P_FLAG
 			0x44, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x00,
 			0x00, 0x04, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04,
 			0x00, 0x04, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04,
@@ -95,7 +95,7 @@ void i286x_setextsize(UINT32 size) {
 			CPU_EXTMEM = NULL;
 		}
 		if (size) {
-			CPU_EXTMEM = (BYTE *)_MALLOC(size + 16, "EXTMEM");
+			CPU_EXTMEM = (UINT8 *)_MALLOC(size + 16, "EXTMEM");
 			if (CPU_EXTMEM == NULL) {
 				size = 0;
 			}
@@ -110,7 +110,7 @@ void i286x_setextsize(UINT32 size) {
 
 void i286x_setemm(UINT frame, UINT32 addr) {
 
-	BYTE	*ptr;
+	UINT8	*ptr;
 
 	frame &= 3;
 	if (addr < USE_HIMEM) {
@@ -138,7 +138,7 @@ LABEL void i286x_resetprefetch(void) {
 	}
 }
 
-LABEL void __fastcall i286x_interrupt(BYTE vect) {
+LABEL void __fastcall i286x_interrupt(UINT8 vect) {
 
 	__asm {
 				pushad
@@ -276,7 +276,7 @@ i286_mnlp:		movzx	eax, bl
 				align	16
 i286_dma_mnlp:	movzx	eax, bl
 				call	i286op[eax*4]
-				call	dmap_i286
+				call	dmax86
 				cmp		I286_REMCLOCK, 0
 				jg		i286_dma_mnlp
 				mov		dword ptr (i286core.s.prefetchque), ebx
@@ -318,7 +318,7 @@ nexts:
 				mov		dword ptr (i286core.s.prefetchque), ebx
 				mov		I286_IP, si
 
-				call	dmap_i286
+				call	dmax86
 				popad
 				ret
 		}