--- np2/io/iocore.c	2003/12/26 22:24:06	1.4
+++ np2/io/iocore.c	2004/03/23 04:45:04	1.15
@@ -5,6 +5,7 @@
 #include	"cbuscore.h"
 #include	"sound.h"
 #include	"fmboard.h"
+#include	"ideio.h"
 #include	"cs4231io.h"
 #include	"iocore16.tbl"
 
@@ -16,13 +17,14 @@
 	_DMAC		dmac;
 	_EGC		egc;
 	_EPSONIO	epsonio;
-	_EXTMEM		extmem;
+	_EMSIO		emsio;
 	_FDC		fdc;
 	_GDC		gdc;
 	_GDCS		gdcs;
 	_GRCG		grcg;
-	_KEYB		keyb;
+	_KEYBRD		keybrd;
 	_MOUSEIF	mouseif;
+	_NECIO		necio;
 	_NMIIO		nmiio;
 	_NP2SYSP	np2sysp;
 	_PIC		pic;
@@ -31,6 +33,10 @@
 	_SYSPORT	sysport;
 	_UPD4990	uPD4990;
 
+#if defined(SUPPORT_PC9821)
+	_PCIDEV		pcidev;
+#endif
+
 
 // ----
 
@@ -49,6 +55,7 @@ typedef struct {
 
 typedef struct {
 	IOFUNC		base[256];
+	UINT		busclock;
 	LISTARRAY	iotbl;
 } _IOCORE, *IOCORE;
 
@@ -68,6 +75,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) {
@@ -78,6 +86,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);
 }
 
@@ -425,8 +434,15 @@ 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
+#if defined(SUPPORT_PC9821)
+			pcidev_reset,
+#endif
+		};
 
 static const IOCBFN bindfn[] = {
 			// PC-9801 System...
@@ -440,8 +456,15 @@ 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
+#if defined(SUPPORT_PC9821)
+			pcidev_bind,
+#endif
+		};
 
 
 void iocore_cb(const IOCBFN *cbfn, UINT count) {
@@ -459,15 +482,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);
 }
@@ -476,43 +500,23 @@ 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(("iocore_out8 - %x %x", port, dat));
-	}
-	iof = iocore.base[(port >> 8) & 0xff];
-	iof->ioout[port & 0xff](port, dat);
-}
-
-REG8 IOINPCALL iocore_inp8(UINT port) {
+void IOOUTCALL iocore_out16(UINT port, REG16 dat) {
 
 	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));
+	CPU_REMCLOCK -= iocore.busclock;
+#if defined(SUPPORT_IDEIO)
+	if (port == 0x0640) {
+		ideio_w16(port, dat);
+		return;
 	}
-	return(ret);
-}
-
 #endif
-
-void IOOUTCALL iocore_out16(UINT port, REG16 dat) {
-
-	IOFUNC	iof;
-
 	if ((port & 0xfff1) == 0x04a0) {
 		egc_w16(port, dat);
 		return;
@@ -543,6 +547,12 @@ REG16 IOINPCALL iocore_inp16(UINT port) 
 	IOFUNC	iof;
 	REG8	ret;
 
+	CPU_REMCLOCK -= iocore.busclock;
+#if defined(SUPPORT_IDEIO)
+	if (port == 0x0640) {
+		return(ideio_r16(port));
+	}
+#endif
 	if ((port & 0xfffc) == 0x005c) {
 		return(artic_r16(port));
 	}
@@ -576,14 +586,27 @@ REG16 IOINPCALL iocore_inp16(UINT port) 
 
 void IOOUTCALL iocore_out32(UINT port, UINT32 dat) {
 
+	CPU_REMCLOCK -= iocore.busclock;
+#if defined(SUPPORT_PC9821)
+	if ((port & 0xfffb) == 0x0cf8) {
+		pcidev_w32(port, dat);
+		return;
+	}
+#endif
 	iocore_out16(port, (UINT16)dat);
 	iocore_out16(port+2, (UINT16)(dat >> 16));
 }
 
 UINT32 IOINPCALL iocore_inp32(UINT port) {
 
-	REG16	ret;
+	UINT32	ret;
 
+	CPU_REMCLOCK -= iocore.busclock;
+#if defined(SUPPORT_PC9821)
+	if ((port & 0xfffb) == 0x0cf8) {
+		return(pcidev_r32(port));
+	}
+#endif
 	ret = iocore_inp16(port);
 	return(ret + (iocore_inp16(port+2) << 16));
 }