--- np2/win9x/x86/np2asm.inc	2003/10/16 17:58:57	1.1
+++ np2/win9x/x86/np2asm.inc	2004/01/05 07:48:22	1.9
@@ -14,9 +14,10 @@ FC_ARG6			equ		(FC_ARG5+4)
 
 
 				struc	np2cfg_t
-.baseclock		resd	1
-.multiple		resd	1
 .uPD72020		resb	1
+.DISPSYNC		resb	1
+.RASTER			resb	1
+.realpal		resb	1
 				endstruc
 
 
@@ -46,6 +47,41 @@ SCRN_BUFSIZE	equ		04b000h
 
 GDCCMD_MAX		equ		32
 
+				struc	i286core_t
+.reg			resw	14
+.es_base		resd	1
+.cs_base		resd	1
+.ss_base		resd	1
+.ds_base		resd	1
+.ss_fix			resd	1
+.ds_fix			resd	1
+.adrsmask		resd	1
+.prefix			resw	1
+.trap			resb	1
+.resetreq		resb	1
+.prefetchque	resd	1
+.GDTR			resb	6
+.MSW			resw	1
+.IDTR			resb	6
+.LDTR			resw	1
+.LDTRC			resb	6
+.TR				resw	1
+.TRC			resb	6
+				resb	2
+
+.cpu_type		resb	1
+.itfbank		resb	1
+.ram_d0			resw	1
+.remainclock	resd	1
+.baseclock		resd	1
+.clock			resd	1
+
+.ext			resd	1
+.extsize		resd	1
+.repbak			resd	1
+.inport			resd	1
+				endstruc
+
 				struc	gdcd_t
 .para			resb	256
 .fifo			resw	GDCCMD_MAX
@@ -55,7 +91,7 @@ GDCCMD_MAX		equ		32
 .snd			resb	1
 .cmd			resb	1
 .paracb			resb	1
-.reserved		resb	3
+.reserved		resb	1
 				endstruc
 
 				struc	gdc_t
@@ -77,7 +113,6 @@ GDCCMD_MAX		equ		32
 .reserved		resb	3
 				endstruc
 
-
 				struc	gdcs_t
 .access			resb	1
 .disp			resb	1
@@ -100,7 +135,6 @@ GDCCMD_MAX		equ		32
 
 				struc	extmem_t
 .maxmem			resd	1
-.adrsmask		resd	1
 .pageptr		resd	4
 .target			resd	1
 .page			resd	4
@@ -112,12 +146,6 @@ GDCCMD_MAX		equ		32
 .writable		resb	1
 				endstruc
 
-				struc	nevent_t
-.remainclock	resd	1
-.baseclock		resd	1
-.clock			resd	1
-				endstruc
-
 				struc	vramop_t
 .operate		resd	1
 .tramwait		resd	1
@@ -142,9 +170,6 @@ GDCCMD_MAX		equ		32
 .func			resd	1
 .remain			resd	1
 .stack			resd	1
-				resd	4
-.buf			resb	(4096/8 + 4*4)
-				resd	4
 .inptr			resd	1
 .outptr			resd	1
 .mask2			resw	1
@@ -153,8 +178,11 @@ GDCCMD_MAX		equ		32
 .dstbit			resb	1
 .sft8bitl		resb	1
 .sft8bitr		resb	1
-				endstruc
 
+				resd	4
+.buf			resb	(4096/8 + 4*4)
+				resd	4
+				endstruc
 
 				struc	dsync_t
 .text_vbp		resd	1