--- np2/io/gdc_pset.h	2003/10/16 17:57:55	1.1.1.1
+++ np2/io/gdc_pset.h	2004/02/09 20:39:39	1.4
@@ -1,15 +1,18 @@
 
-struct _gdcps;
-typedef struct _gdcps	_GDCPSET;
-typedef struct _gdcps	*GDCPSET;
-
-typedef void (MEMCALL * GDCPSFN)(GDCPSET pset, UINT addr, UINT bit);
-
-struct _gdcps {
-	GDCPSFN	func;
-	BYTE	*base;
+struct _gdcpset;
+typedef struct _gdcpset		_GDCPSET;
+typedef struct _gdcpset		*GDCPSET;
+
+typedef void (MEMCALL * GDCPFN)(GDCPSET pen, UINT addr, UINT bit);
+
+struct _gdcpset {
+	GDCPFN	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,8 +23,8 @@ struct _gdcps {
 extern "C" {
 #endif
 
-void MEMCALL gdcpset_prepare(GDCPSET pset, UINT32 csrw, UINT16 pat, BYTE op);
-void MEMCALL gdcpset(GDCPSET pset, UINT16 x, UINT16 y);
+void MEMCALL gdcpset_prepare(GDCPSET pset, UINT32 csrw, REG16 pat, REG8 op);
+void MEMCALL gdcpset(GDCPSET pset, REG16 x, REG16 y);
 
 #ifdef __cplusplus
 }