--- np2/io/iocore.c	2004/01/25 07:53:09	1.7
+++ np2/io/iocore.c	2004/03/10 07:41:49	1.12
@@ -21,8 +21,9 @@
 	_GDC		gdc;
 	_GDCS		gdcs;
 	_GRCG		grcg;
-	_KEYB		keyb;
+	_KEYBRD		keybrd;
 	_MOUSEIF	mouseif;
+	_NECIO		necio;
 	_NMIIO		nmiio;
 	_NP2SYSP	np2sysp;
 	_PIC		pic;
@@ -49,6 +50,7 @@ typedef struct {
 
 typedef struct {
 	IOFUNC		base[256];
+	UINT		busclock;
 	LISTARRAY	iotbl;
 } _IOCORE, *IOCORE;
 
@@ -469,15 +471,16 @@ void iocore_reset(void) {
 
 void iocore_bind(void) {
 
+	iocore.busclock = pccore.multiple;
 	iocore_cb(bindfn, sizeof(bindfn)/sizeof(IOCBFN));
 }
 
-#if !defined(TRACE)
-
 void IOOUTCALL iocore_out8(UINT port, REG8 dat) {
 
 	IOFUNC	iof;
 
+//	VERBOSE(("iocore_out8(%x, %x)", port, dat));
+	CPU_REMCLOCK -= iocore.busclock;
 	iof = iocore.base[(port >> 8) & 0xff];
 	iof->ioout[port & 0xff](port, dat);
 }
@@ -486,43 +489,17 @@ REG8 IOINPCALL iocore_inp8(UINT port) {
 
 	IOFUNC	iof;
 
+//	VERBOSE(("iocore_inp8(%x)", port));
+	CPU_REMCLOCK -= iocore.busclock;
 	iof = iocore.base[(port >> 8) & 0xff];
 	return(iof->ioinp[port & 0xff](port));
 }
 
-#else
-
-void IOOUTCALL iocore_out8(UINT port, REG8 dat) {
-
-	IOFUNC	iof;
-
-	if (dat & (~0xff)) {
-		TRACEOUT(("error: 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(("error: iocore_inp8 - %x %x", port, ret));
-	}
-	return(ret);
-}
-
-#endif
-
 void IOOUTCALL iocore_out16(UINT port, REG16 dat) {
 
 	IOFUNC	iof;
 
+	CPU_REMCLOCK -= iocore.busclock;
 	if ((port & 0xfff1) == 0x04a0) {
 		egc_w16(port, dat);
 		return;
@@ -553,6 +530,7 @@ REG16 IOINPCALL iocore_inp16(UINT port) 
 	IOFUNC	iof;
 	REG8	ret;
 
+	CPU_REMCLOCK -= iocore.busclock;
 	if ((port & 0xfffc) == 0x005c) {
 		return(artic_r16(port));
 	}