--- np2/io/gdc_pset.h	2003/10/16 17:57:55	1.1
+++ np2/io/gdc_pset.h	2004/02/05 11:34:43	1.3
@@ -6,10 +6,13 @@ typedef struct _gdcps	*GDCPSET;
 typedef void (MEMCALL * GDCPSFN)(GDCPSET pset, UINT addr, UINT bit);
 
 struct _gdcps {
-	GDCPSFN	func;
-	BYTE	*base;
+	GDCPSFN	func[2];
+	union {
+		BYTE	*ptr;			// raw access / grcg
+		UINT32	addr;			// egc
+	}		base;
 	UINT16	pattern;
-	BYTE	update;
+	PAIR16	update;
 	UINT16	x;
 	UINT16	y;
 	UINT	dots;
@@ -20,7 +23,7 @@ struct _gdcps {
 extern "C" {
 #endif
 
-void MEMCALL gdcpset_prepare(GDCPSET pset, UINT32 csrw, UINT16 pat, BYTE op);
+void MEMCALL gdcpset_prepare(GDCPSET pset, UINT32 csrw, REG16 pat, REG8 op);
 void MEMCALL gdcpset(GDCPSET pset, UINT16 x, UINT16 y);
 
 #ifdef __cplusplus