--- np2/i286x/memory.x86	2003/10/16 17:57:33	1.1
+++ np2/i286x/memory.x86	2003/10/19 14:56:15	1.2
@@ -7,6 +7,7 @@
 section .bss
 
 	extern	_mem
+	extern	_i286reg
 	extern	_grcg
 	extern	_extmem
 	extern	_gdcs
@@ -16,7 +17,6 @@ section .bss
 ;	extern	___font
 	extern	_itf
 	extern	_vramop
-	extern	_nevent
 
 	extern	_extmemmng_ptr
 	extern	_extmemmng_size
@@ -107,7 +107,7 @@ section .text
 ; tram write
 					align	16
 @tram_wt:			mov		ebx, [_vramop + vramop_t.tramwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					mov		ebx, ecx
 					cmp		ecx, 000a2000h
 					jnc		short wtram_a
@@ -156,7 +156,7 @@ wcgwindow_e:		pop		ebx
 					or		byte [_vramupdate + ebx], 1
 					or		byte [_gdcs + gdcs_t.grphdisp], 1
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -168,7 +168,7 @@ wcgwindow_e:		pop		ebx
 					or		byte [_vramupdate + ebx], 2
 					or		byte [_gdcs + gdcs_t.grphdisp], 2
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -189,7 +189,7 @@ wcgwindow_e:		pop		ebx
 					or		byte [_gdcs + gdcs_t.grphdisp], 1
 
 grcg_rmw:			mov		ebx, [_vramop + vramop_t.grcgwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					mov		ebx, dword [_grcg + grcg_t.mode]
 					mov		bl, dl
 					not		bl
@@ -238,7 +238,7 @@ grcgrmw_end:		pop		ecx
 					or		byte [_gdcs + gdcs_t.grphdisp], 1
 
 grcg_tdw:			mov		ebx, [_vramop + vramop_t.grcgwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					mov		bh, [_grcg + grcg_t.modereg]
 					shr		bh, 1
 					jc		short grcgtdw_r
@@ -305,7 +305,7 @@ grcgtdw_end:		pop		ecx
 ; font cg-window
 					align	16
 @tram_rd:			mov		ebx, [_vramop + vramop_t.tramwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					cmp		ecx, 0a4000h
 					jnc		rcgwindow_s
 rcgwindow_n:		mov		al, [MAINMEMORY + ecx]
@@ -328,7 +328,7 @@ rcgwindow_s:		cmp		ecx, 0a5000h
 					align	16
 @vram_r0:			mov		al, [VIDEOMEMORY + ecx]
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -336,7 +336,7 @@ rcgwindow_s:		cmp		ecx, 0a5000h
 					align	16
 @vram_r1:			mov		al, [VIDEOMEMORY + VRAM_STEP + ecx]
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -351,7 +351,7 @@ rcgwindow_s:		cmp		ecx, 0a5000h
 					and		ecx, 7fffh
 
 grcg_tcr:			mov		ebx, [_vramop + vramop_t.grcgwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					mov		al, 0
 					mov		bh, [_grcg + grcg_t.modereg]
 					shr		bh, 1
@@ -432,7 +432,7 @@ readmem_itr:		mov		ebx, ecx
 ; tram write
 					align	16
 @tramw_wt:			mov		ebx, [_vramop + vramop_t.tramwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					mov		ebx, ecx
 					cmp		ecx, 000a1fffh
 					jnc		short wtramw_a
@@ -507,7 +507,7 @@ wcgwinw_odd:		add		ebx, dword [_cgwindow
 					or		word [_vramupdate + ebx], 0101h
 					or		byte [_gdcs + gdcs_t.grphdisp], 1
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -519,7 +519,7 @@ wcgwinw_odd:		add		ebx, dword [_cgwindow
 					or		word [_vramupdate + ebx], 0202h
 					or		byte [_gdcs + gdcs_t.grphdisp], 2
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -540,7 +540,7 @@ wcgwinw_odd:		add		ebx, dword [_cgwindow
 					or		byte [_gdcs + gdcs_t.grphdisp], 1
 
 grcgw_rmw:			mov		ebx, [_vramop + vramop_t.grcgwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					push	eax
 					mov		ebx, dword [_grcg + grcg_t.mode]
 					mov		bx, dx
@@ -591,7 +591,7 @@ grcgwrmw_end:		pop		eax
 					or		byte [_gdcs + gdcs_t.grphdisp], 1
 
 grcgw_tdw:			mov		ebx, [_vramop + vramop_t.grcgwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					mov		ebx, [_grcg + grcg_t.mode]
 					test	ebx, 010000h
 					jne		short grcgwtdw_r
@@ -666,7 +666,7 @@ egcw_wtodd:
 ; font cg-window
 					align	16
 @tramw_rd:			mov		ebx, [_vramop + vramop_t.tramwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					cmp		ecx, 0a3fffh
 					jnc		rcgwwindow_s
 					mov		ax, [MAINMEMORY + ecx]
@@ -720,7 +720,7 @@ rcgwwindow_a4fff:	mov		ebx, dword [_cgwi
 					align	16
 @vramw_r0:			mov		ax, [VIDEOMEMORY + ecx]
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -728,7 +728,7 @@ rcgwwindow_a4fff:	mov		ebx, dword [_cgwi
 					align	16
 @vramw_r1:			mov		ax, [VIDEOMEMORY + VRAM_STEP + ecx]
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -743,7 +743,7 @@ rcgwwindow_a4fff:	mov		ebx, dword [_cgwi
 					and		ecx, 7fffh
 
 grcgw_tcr:			mov		ebx, [_vramop + vramop_t.grcgwait]
-					sub		[_nevent + nevent_t.remainclock], ebx
+					sub		[_i286reg + i286reg_t.remainclock], ebx
 					mov		ax, 0
 					mov		ebx, [_grcg + grcg_t.mode]
 					test	ebx, 010000h