--- np2/io/iocore.c	2004/01/25 07:53:09	1.7
+++ np2/io/iocore.c	2004/02/07 21:23:22	1.9
@@ -21,7 +21,7 @@
 	_GDC		gdc;
 	_GDCS		gdcs;
 	_GRCG		grcg;
-	_KEYB		keyb;
+	_KEYBRD		keybrd;
 	_MOUSEIF	mouseif;
 	_NMIIO		nmiio;
 	_NP2SYSP	np2sysp;
@@ -472,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;
@@ -490,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(("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;