--- np2/io/iocore.c	2003/12/08 00:55:32	1.3
+++ np2/io/iocore.c	2004/02/07 21:23:22	1.9
@@ -15,12 +15,13 @@
 	_CRTC		crtc;
 	_DMAC		dmac;
 	_EGC		egc;
-	_EXTMEM		extmem;
+	_EPSONIO	epsonio;
+	_EMSIO		emsio;
 	_FDC		fdc;
 	_GDC		gdc;
 	_GDCS		gdcs;
 	_GRCG		grcg;
-	_KEYB		keyb;
+	_KEYBRD		keybrd;
 	_MOUSEIF	mouseif;
 	_NMIIO		nmiio;
 	_NP2SYSP	np2sysp;
@@ -67,6 +68,7 @@ static void IOOUTCALL defout8(UINT port,
 		dipsw_w8(port, dat);
 		return;
 	}
+//	TRACEOUT(("defout8 - %x %x %.4x %.4x", port, dat, CPU_CS, CPU_IP));
 }
 
 static REG8 IOINPCALL definp8(UINT port) {
@@ -77,6 +79,7 @@ static REG8 IOINPCALL definp8(UINT port)
 	if ((port & 0xf0ff) == 0x801e) {
 		return(dipsw_r8(port));
 	}
+//	TRACEOUT(("definp8 - %x %.4x %.4x", port, CPU_CS, CPU_IP));
 	return(0xff);
 }
 
@@ -424,8 +427,12 @@ static const IOCBFN resetfn[] = {
 			itimer_reset,		mouseif_reset,
 
 			// extend
-								artic_reset,		egc_reset,
-			extmem_reset,		np2sysp_reset};
+			artic_reset,		egc_reset,			np2sysp_reset,
+			necio_reset,		epsonio_reset,
+#if !defined(CPUCORE_IA32)
+			emsio_reset,
+#endif
+		};
 
 static const IOCBFN bindfn[] = {
 			// PC-9801 System...
@@ -439,8 +446,12 @@ static const IOCBFN bindfn[] = {
 			itimer_bind,		mouseif_bind,
 
 			// extend
-			itf_bind,			artic_bind,			egc_bind,
-			extmem_bind,		np2sysp_bind};
+			artic_bind,			egc_bind,			np2sysp_bind,
+			necio_bind,			epsonio_bind,
+#if !defined(CPUCORE_IA32)
+			emsio_bind,
+#endif
+		};
 
 
 void iocore_cb(const IOCBFN *cbfn, UINT count) {
@@ -461,8 +472,6 @@ void iocore_bind(void) {
 	iocore_cb(bindfn, sizeof(bindfn)/sizeof(IOCBFN));
 }
 
-#if !defined(TRACE)
-
 void IOOUTCALL iocore_out8(UINT port, REG8 dat) {
 
 	IOFUNC	iof;
@@ -479,35 +488,6 @@ REG8 IOINPCALL iocore_inp8(UINT port) {
 	return(iof->ioinp[port & 0xff](port));
 }
 
-#else
-
-void IOOUTCALL iocore_out8(UINT port, REG8 dat) {
-
-	IOFUNC	iof;
-
-	if (dat & (~0xff)) {
-		TRACEOUT(("iocore_out8 - %x %x", port, dat));
-	}
-	iof = iocore.base[(port >> 8) & 0xff];
-	iof->ioout[port & 0xff](port, dat);
-}
-
-REG8 IOINPCALL iocore_inp8(UINT port) {
-
-	IOFUNC	iof;
-	REG8	ret;
-
-	iof = iocore.base[(port >> 8) & 0xff];
-	ret = iof->ioinp[port & 0xff](port);
-
-	if (ret & (~0xff)) {
-		TRACEOUT(("iocore_inp8 - %x %x", port, ret));
-	}
-	return(ret);
-}
-
-#endif
-
 void IOOUTCALL iocore_out16(UINT port, REG16 dat) {
 
 	IOFUNC	iof;