--- np2/io/egc.h	2003/10/18 00:35:35	1.2
+++ np2/io/egc.h	2003/12/08 00:55:32	1.5
@@ -1,33 +1,15 @@
 
 typedef union {
-	BYTE	_b[2];
+	UINT8	_b[2];
 	UINT16	w;
 } EGCWORD;
 
 typedef union {
-	BYTE	_b[4][2];
+	UINT8	_b[4][2];
 	UINT16	w[4];
 	UINT32	d[2];
 } EGCQUAD;
 
-#if defined(BYTESEX_LITTLE)
-
-enum {
-	EGCADDR_L		= 0,
-	EGCADDR_H		= 1
-};
-#define	EGCADDR(a)	(a)
-
-#elif defined(BYTESEX_BIG)
-
-enum {
-	EGCADDR_L		= 1,
-	EGCADDR_H		= 0
-};
-#define	EGCADDR(a)	((a) ^ 1)
-
-#endif
-
 typedef struct {
 	UINT16	access;
 	UINT16	fgbg;
@@ -52,10 +34,10 @@ typedef struct {
 	BYTE	*outptr;
 	EGCWORD	mask2;
 	EGCWORD	srcmask;
-	BYTE	srcbit;
-	BYTE	dstbit;
-	BYTE	sft8bitl;
-	BYTE	sft8bitr;
+	UINT8	srcbit;
+	UINT8	dstbit;
+	UINT8	sft8bitl;
+	UINT8	sft8bitr;
 } _EGC, *EGC;
 
 
@@ -63,11 +45,9 @@ typedef struct {
 extern "C" {
 #endif
 
-extern const UINT32 maskword[16][2];
-
 void egc_reset(void);
 void egc_bind(void);
-void IOOUTCALL egc_w16(UINT port, UINT16 value);
+void IOOUTCALL egc_w16(UINT port, REG16 value);
 
 #ifdef __cplusplus
 }