--- np2/i286x/v30patch.cpp	2004/08/03 10:11:37	1.8
+++ np2/i286x/v30patch.cpp	2005/02/12 12:13:58	1.10
@@ -10,7 +10,7 @@
 #include	"iocore.h"
 #include	"i286x.mcr"
 #include	"i286xea.mcr"
-#include	"dmap.h"
+#include	"dmax86.h"
 
 
 typedef struct {
@@ -25,7 +25,7 @@ static	I286TBL	v30ope0xf6_xtable[8];
 static	I286TBL v30ope0xf7_xtable[8];
 
 
-static const BYTE shiftbase16[256] =
+static const UINT8 shiftbase16[256] =
 				{0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
 				16, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
 				16, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
@@ -43,7 +43,7 @@ static const BYTE shiftbase16[256] =
 				16, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
 				16, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15};
 
-static const BYTE shiftbase09[256] =
+static const UINT8 shiftbase09[256] =
 				{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6,
 				 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4,
 				 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2,
@@ -61,7 +61,7 @@ static const BYTE shiftbase09[256] =
 				 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5,
 				 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3};
 
-static const BYTE shiftbase17[256] =
+static const UINT8 shiftbase17[256] =
 				{0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
 				16,17, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,
 				15,16,17, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,
@@ -1196,7 +1196,7 @@ v30_mnlp:		movzx	eax, bl
 				align	4
 v30_dma_mnlp:	movzx	eax, bl
 				call	v30op[eax*4]
-				call	dmap_i286
+				call	dmax86
 				cmp		I286_REMCLOCK, 0
 				jg		v30_dma_mnlp
 				mov		dword ptr (i286core.s.prefetchque), ebx
@@ -1236,7 +1236,7 @@ nexts:
 				mov		dword ptr (i286core.s.prefetchque), ebx
 				mov		I286_IP, si
 
-				call	dmap_i286
+				call	dmax86
 				popad
 				ret
 		}