--- np2/i286c/memory.c	2003/10/16 17:57:47	1.1
+++ np2/i286c/memory.c	2003/11/15 07:10:02	1.3
@@ -19,7 +19,7 @@ static void MEMCALL i286_wt(UINT32 addre
 
 static void MEMCALL tram_wt(UINT32 address, BYTE value) {
 
-	nevent.remainclock -= vramop.tramwait;
+	I286_REMCLOCK -= vramop.tramwait;
 	if (address < 0xa2000) {
 		mem[address] = value;
 		tramupdate[(address >> 1) & 0x0fff] = 1;
@@ -44,14 +44,14 @@ static void MEMCALL tram_wt(UINT32 addre
 	else if (address < 0xa5000) {
 		if ((address & 1) && (cgwindow.writable & 1)) {
 			cgwindow.writable |= 0x80;
-			font[cgwindow.high + ((address >> 1) & 0x0f)] = value;
+			fontrom[cgwindow.high + ((address >> 1) & 0x0f)] = value;
 		}
 	}
 }
 
 static void MEMCALL vram_w0(UINT32 address, BYTE value) {
 
-	nevent.remainclock -= vramop.vramwait;
+	I286_REMCLOCK -= vramop.vramwait;
 	mem[address] = value;
 	vramupdate[address & 0x7fff] |= 1;
 	gdcs.grphdisp |= 1;
@@ -59,7 +59,7 @@ static void MEMCALL vram_w0(UINT32 addre
 
 static void MEMCALL vram_w1(UINT32 address, BYTE value) {
 
-	nevent.remainclock -= vramop.vramwait;
+	I286_REMCLOCK -= vramop.vramwait;
 	mem[address + VRAM_STEP] = value;
 	vramupdate[address & 0x7fff] |= 2;
 	gdcs.grphdisp |= 2;
@@ -70,7 +70,7 @@ static void MEMCALL grcg_rmw0(UINT32 add
 	BYTE	mask;
 	BYTE	*vram;
 
-	nevent.remainclock -= vramop.grcgwait;
+	I286_REMCLOCK -= vramop.grcgwait;
 	mask = ~value;
 	address &= 0x7fff;
 	vramupdate[address] |= 1;
@@ -99,7 +99,7 @@ static void MEMCALL grcg_rmw1(UINT32 add
 	BYTE	mask;
 	BYTE	*vram;
 
-	nevent.remainclock -= vramop.grcgwait;
+	I286_REMCLOCK -= vramop.grcgwait;
 	mask = ~value;
 	address &= 0x7fff;
 	vramupdate[address] |= 2;
@@ -127,7 +127,7 @@ static void MEMCALL grcg_tdw0(UINT32 add
 
 	BYTE	*vram;
 
-	nevent.remainclock -= vramop.grcgwait;
+	I286_REMCLOCK -= vramop.grcgwait;
 	address &= 0x7fff;
 	vramupdate[address] |= 1;
 	gdcs.grphdisp |= 1;
@@ -151,7 +151,7 @@ static void MEMCALL grcg_tdw1(UINT32 add
 
 	BYTE	*vram;
 
-	nevent.remainclock -= vramop.grcgwait;
+	I286_REMCLOCK -= vramop.grcgwait;
 	address &= 0x7fff;
 	vramupdate[address] |= 2;
 	gdcs.grphdisp |= 2;
@@ -197,16 +197,16 @@ static BYTE MEMCALL i286_rd(UINT32 addre
 
 static BYTE MEMCALL tram_rd(UINT32 address) {
 
-	nevent.remainclock -= vramop.tramwait;
+	I286_REMCLOCK -= vramop.tramwait;
 	if (address < 0xa4000) {
 		return(mem[address]);
 	}
 	else if (address < 0xa5000) {
 		if (address & 1) {
-			return(font[cgwindow.high + ((address >> 1) & 0x0f)]);
+			return(fontrom[cgwindow.high + ((address >> 1) & 0x0f)]);
 		}
 		else {
-			return(font[cgwindow.low + ((address >> 1) & 0x0f)]);
+			return(fontrom[cgwindow.low + ((address >> 1) & 0x0f)]);
 		}
 	}
 	return(mem[address]);
@@ -214,13 +214,13 @@ static BYTE MEMCALL tram_rd(UINT32 addre
 
 static BYTE MEMCALL vram_r0(UINT32 address) {
 
-	nevent.remainclock -= vramop.vramwait;
+	I286_REMCLOCK -= vramop.vramwait;
 	return(mem[address]);
 }
 
 static BYTE MEMCALL vram_r1(UINT32 address) {
 
-	nevent.remainclock -= vramop.vramwait;
+	I286_REMCLOCK -= vramop.vramwait;
 	return(mem[address + VRAM_STEP]);
 }
 
@@ -229,7 +229,7 @@ static BYTE MEMCALL grcg_tcr0(UINT32 add
 const BYTE	*vram;
 	BYTE	ret;
 
-	nevent.remainclock -= vramop.grcgwait;
+	I286_REMCLOCK -= vramop.grcgwait;
 	vram = mem + (address & 0x7fff);
 	ret = 0;
 	if (!(grcg.modereg & 1)) {
@@ -252,7 +252,7 @@ static BYTE MEMCALL grcg_tcr1(UINT32 add
 	BYTE	*vram;
 	BYTE	ret;
 
-	nevent.remainclock -= vramop.grcgwait;
+	I286_REMCLOCK -= vramop.grcgwait;
 	ret = 0;
 	vram = mem + (address & 0x7fff);
 	if (!(grcg.modereg & 1)) {
@@ -339,14 +339,14 @@ static void MEMCALL tramw_wt(UINT32 addr
 		}
 		if (cgwindow.writable & 1) {
 			cgwindow.writable |= 0x80;
-			font[cgwindow.high + ((address >> 1) & 0x0f)] = (BYTE)value;
+			fontrom[cgwindow.high + ((address >> 1) & 0x0f)] = (BYTE)value;
 		}
 	}
 }
 
 
 #define GRCGW_NON(page) {											\
-	nevent.remainclock -= vramop.vramwait;							\
+	I286_REMCLOCK -= vramop.vramwait;								\
 	STOREINTELWORD(mem + address + VRAM_STEP*(page), value);		\
 	vramupdate[address & 0x7fff] |= (1 << page);					\
 	vramupdate[(address + 1) & 0x7fff] |= (1 << page);				\
@@ -355,7 +355,7 @@ static void MEMCALL tramw_wt(UINT32 addr
 
 #define GRCGW_RMW(page) {											\
 	BYTE	*vram;													\
-	nevent.remainclock -= vramop.grcgwait;							\
+	I286_REMCLOCK -= vramop.grcgwait;								\
 	address &= 0x7fff;												\
 	vramupdate[address] |= (1 << page);								\
 	vramupdate[address + 1] |= (1 << page);							\
@@ -401,7 +401,7 @@ static void MEMCALL tramw_wt(UINT32 addr
 
 #define GRCGW_TDW(page) {											\
 	BYTE	*vram;													\
-	nevent.remainclock -= vramop.grcgwait;							\
+	I286_REMCLOCK -= vramop.grcgwait;								\
 	address &= 0x7fff;												\
 	vramupdate[address] |= (1 << page);								\
 	vramupdate[address + 1] |= (1 << page);							\
@@ -483,42 +483,42 @@ static UINT16 MEMCALL i286w_rd(UINT32 ad
 
 static UINT16 MEMCALL tramw_rd(UINT32 address) {
 
-	nevent.remainclock -= vramop.tramwait;
+	I286_REMCLOCK -= vramop.tramwait;
 	if (address < (0xa4000 - 1)) {
 		return(LOADINTELWORD(mem + address));
 	}
 	else if (address == 0xa3fff) {
-		return(mem[address] + (font[cgwindow.low] << 8));
+		return(mem[address] + (fontrom[cgwindow.low] << 8));
 	}
 	else if (address < 0xa4fff) {
 		if (address & 1) {
 			UINT16 ret;
-			ret = font[cgwindow.high + ((address >> 1) & 0x0f)];
-			ret += font[cgwindow.low + (((address + 1) >> 1) & 0x0f)] << 8;
+			ret = fontrom[cgwindow.high + ((address >> 1) & 0x0f)];
+			ret += fontrom[cgwindow.low + (((address + 1) >> 1) & 0x0f)] << 8;
 			return(ret);
 		}
 		else {
 			UINT16 ret;
-			ret = font[cgwindow.low + ((address >> 1) & 0x0f)];
-			ret += font[cgwindow.high + ((address >> 1) & 0x0f)] << 8;
+			ret = fontrom[cgwindow.low + ((address >> 1) & 0x0f)];
+			ret += fontrom[cgwindow.high + ((address >> 1) & 0x0f)] << 8;
 			return(ret);
 		}
 	}
 	else if (address == 0xa4fff) {
-		return((mem[0xa5000] << 8) | font[cgwindow.high + 15]);
+		return((mem[0xa5000] << 8) | fontrom[cgwindow.high + 15]);
 	}
 	return(LOADINTELWORD(mem + address));
 }
 
 static UINT16 MEMCALL vramw_r0(UINT32 address) {
 
-	nevent.remainclock -= vramop.vramwait;
+	I286_REMCLOCK -= vramop.vramwait;
 	return(LOADINTELWORD(mem + address));
 }
 
 static UINT16 MEMCALL vramw_r1(UINT32 address) {
 
-	nevent.remainclock -= vramop.vramwait;
+	I286_REMCLOCK -= vramop.vramwait;
 	return(LOADINTELWORD(mem + address + VRAM_STEP));
 }
 
@@ -527,7 +527,7 @@ static UINT16 MEMCALL grcgw_tcr0(UINT32 
 	BYTE	*vram;
 	UINT16	ret;
 
-	nevent.remainclock -= vramop.grcgwait;
+	I286_REMCLOCK -= vramop.grcgwait;
 	ret = 0;
 	vram = mem + (address & 0x7fff);
 	if (!(grcg.modereg & 1)) {
@@ -550,7 +550,7 @@ static UINT16 MEMCALL grcgw_tcr1(UINT32 
 	BYTE	*vram;
 	UINT16	ret;
 
-	nevent.remainclock -= vramop.grcgwait;
+	I286_REMCLOCK -= vramop.grcgwait;
 	ret = 0;
 	vram = mem + (address & 0x7fff);
 	if (!(grcg.modereg & 1)) {