--- np2/io/iocore.h	2003/10/16 17:57:49	1.1.1.1
+++ np2/io/iocore.h	2004/01/05 06:05:11	1.5
@@ -1,10 +1,4 @@
 
-#if 0
-#define I286_OUT void
-typedef	BYTE	I286_INB;
-typedef UINT16	I286_INW;
-#endif
-
 #ifndef IOOUTCALL
 #define	IOOUTCALL
 #endif
@@ -12,8 +6,8 @@ typedef UINT16	I286_INW;
 #define	IOINPCALL
 #endif
 
-typedef	void (IOOUTCALL *IOOUT)(UINT port, BYTE val);
-typedef	BYTE (IOINPCALL *IOINP)(UINT port);
+typedef	void (IOOUTCALL *IOOUT)(UINT port, REG8 val);
+typedef	REG8 (IOINPCALL *IOINP)(UINT port);
 
 typedef void (*IOCBFN)(void);
 
@@ -25,14 +19,15 @@ typedef void (*IOCBFN)(void);
 #include	"dipsw.h"
 #include	"dmac.h"
 #include	"egc.h"
+#include	"epsonio.h"
 #include	"extmem.h"
 #include	"fdc.h"
 #include	"fdd320.h"
 #include	"gdc.h"
 #include	"gdc_cmd.h"
 #include	"gdc_sub.h"
-#include	"itf.h"
 #include	"mouseif.h"
+#include	"necio.h"
 #include	"nmiio.h"
 #include	"np2sysp.h"
 #include	"pic.h"
@@ -50,16 +45,15 @@ extern "C" {
 extern	_ARTIC		artic;
 extern	_CGROM		cgrom;
 extern	_CGWINDOW	cgwindow;
-extern	_CPUIO		cpuio;
 extern	_CRTC		crtc;
 extern	_DMAC		dmac;
 extern	_EGC		egc;
+extern	_EPSONIO	epsonio;
 extern	_EXTMEM		extmem;
 extern	_FDC		fdc;
 extern	_GDC		gdc;
 extern	_GDCS		gdcs;
 extern	_GRCG		grcg;
-extern	_ITF		itf;
 extern	_KEYB		keyb;
 extern	_MOUSEIF	mouseif;
 extern	_NMIIO		nmiio;
@@ -103,11 +97,14 @@ void iocore_cb(const IOCBFN *cbfn, UINT 
 void iocore_reset(void);
 void iocore_bind(void);
 
-void IOOUTCALL iocore_out8(UINT port, BYTE val);
-BYTE IOINPCALL iocore_inp8(UINT port);
+void IOOUTCALL iocore_out8(UINT port, REG8 dat);
+REG8 IOINPCALL iocore_inp8(UINT port);
+
+void IOOUTCALL iocore_out16(UINT port, REG16 dat);
+REG16 IOINPCALL iocore_inp16(UINT port);
 
-void IOOUTCALL iocore_out16(UINT port, UINT16 dat);
-UINT16 IOINPCALL iocore_inp16(UINT port);
+void IOOUTCALL iocore_out32(UINT port, UINT32 dat);
+UINT32 IOINPCALL iocore_inp32(UINT port);
 
 #ifdef __cplusplus
 }