--- np2/io/iocore.c	2004/03/19 00:30:01	1.13
+++ np2/io/iocore.c	2005/04/08 19:39:09	1.22
@@ -5,6 +5,7 @@
 #include	"cbuscore.h"
 #include	"sound.h"
 #include	"fmboard.h"
+#include	"ideio.h"
 #include	"cs4231io.h"
 #include	"iocore16.tbl"
 
@@ -32,6 +33,10 @@
 	_SYSPORT	sysport;
 	_UPD4990	uPD4990;
 
+#if defined(SUPPORT_PC9821)
+	_PCIDEV		pcidev;
+#endif
+
 
 // ----
 
@@ -62,10 +67,20 @@ static	UINT8		ioterminate[0x100];
 
 static void IOOUTCALL defout8(UINT port, REG8 dat) {
 
-	if ((port & 0xfff0) == cs4231.port) {
-		cs4231io_w8(port, dat);
+#if !defined(DISABLE_SOUND)
+	UINT	tmp;
+
+	tmp = port - cs4231.port[0];
+	if (tmp < 8) {
+		cs4231io0_w8(port, dat);
 		return;
 	}
+	tmp = port - cs4231.port[5];
+	if (tmp < 2) {
+		cs4231io5_w8(port, dat);
+		return;
+	}
+#endif
 	if ((port & 0xf0ff) == 0x801e) {
 		dipsw_w8(port, dat);
 		return;
@@ -75,9 +90,18 @@ static void IOOUTCALL defout8(UINT port,
 
 static REG8 IOINPCALL definp8(UINT port) {
 
-	if ((port & 0xfff0) == cs4231.port) {
-		return(cs4231io_r8(port));
+#if !defined(DISABLE_SOUND)
+	UINT	tmp;
+
+	tmp = port - cs4231.port[0];
+	if (tmp < 8) {
+		return(cs4231io0_r8(port));
+	}
+	tmp = port - cs4231.port[5];
+	if (tmp < 2) {
+		return(cs4231io5_r8(port));
 	}
+#endif
 	if ((port & 0xf0ff) == 0x801e) {
 		return(dipsw_r8(port));
 	}
@@ -234,7 +258,7 @@ void iocore_attachsysinpex(UINT port, UI
 
 // ----
 
-static BOOL makesndiofunc(UINT port) {
+static BRESULT makesndiofunc(UINT port) {
 
 	IOFUNC	tbl[2];
 	UINT	num;
@@ -264,9 +288,9 @@ static BOOL makesndiofunc(UINT port) {
 	return(SUCCESS);
 }
 
-BOOL iocore_attachsndout(UINT port, IOOUT func) {
+BRESULT iocore_attachsndout(UINT port, IOOUT func) {
 
-	BOOL	r;
+	BRESULT	r;
 	UINT	num;
 
 	r = makesndiofunc(port);
@@ -280,9 +304,9 @@ BOOL iocore_attachsndout(UINT port, IOOU
 	return(r);
 }
 
-BOOL iocore_attachsndinp(UINT port, IOINP func) {
+BRESULT iocore_attachsndinp(UINT port, IOINP func) {
 
-	BOOL	r;
+	BRESULT	r;
 	UINT	num;
 
 	r = makesndiofunc(port);
@@ -315,7 +339,7 @@ static IOFUNC getextiofunc(UINT port) {
 	return(iof);
 }
 
-BOOL iocore_attachout(UINT port, IOOUT func) {
+BRESULT iocore_attachout(UINT port, IOOUT func) {
 
 	IOFUNC	iof;
 
@@ -329,7 +353,7 @@ BOOL iocore_attachout(UINT port, IOOUT f
 	}
 }
 
-BOOL iocore_attachinp(UINT port, IOINP func) {
+BRESULT iocore_attachinp(UINT port, IOINP func) {
 
 	IOFUNC	iof;
 
@@ -354,7 +378,7 @@ const UINT8	*p;
 
 	ZeroMemory(&iocore, sizeof(iocore));
 	ZeroMemory(ioterminate, sizeof(ioterminate));
-	for (i=0; i<(sizeof(termtbl)/sizeof(TERMTBL)); i++) {
+	for (i=0; i<NELEMENTS(termtbl); i++) {
 		p = termtbl[i].item;
 		r = termtbl[i].items;
 		do {
@@ -372,7 +396,7 @@ void iocore_destroy(void) {
 	ioc->iotbl = NULL;
 }
 
-BOOL iocore_build(void) {
+BRESULT iocore_build(void) {
 
 	IOCORE		ioc;
 	IOFUNC		cmn;
@@ -430,10 +454,7 @@ static const IOCBFN resetfn[] = {
 
 			// extend
 			artic_reset,		egc_reset,			np2sysp_reset,
-			necio_reset,		epsonio_reset,
-#if !defined(CPUCORE_IA32)
-			emsio_reset,
-#endif
+			necio_reset,		epsonio_reset,		emsio_reset,
 #if defined(SUPPORT_PC9821)
 			pcidev_reset,
 #endif
@@ -452,10 +473,7 @@ static const IOCBFN bindfn[] = {
 
 			// extend
 			artic_bind,			egc_bind,			np2sysp_bind,
-			necio_bind,			epsonio_bind,
-#if !defined(CPUCORE_IA32)
-			emsio_bind,
-#endif
+			necio_bind,			epsonio_bind,		emsio_bind,
 #if defined(SUPPORT_PC9821)
 			pcidev_bind,
 #endif
@@ -472,20 +490,20 @@ void iocore_cb(const IOCBFN *cbfn, UINT 
 
 void iocore_reset(void) {
 
-	iocore_cb(resetfn, sizeof(resetfn)/sizeof(IOCBFN));
+	iocore_cb(resetfn, NELEMENTS(resetfn));
 }
 
 void iocore_bind(void) {
 
 	iocore.busclock = pccore.multiple;
-	iocore_cb(bindfn, sizeof(bindfn)/sizeof(IOCBFN));
+	iocore_cb(bindfn, NELEMENTS(bindfn));
 }
 
 void IOOUTCALL iocore_out8(UINT port, REG8 dat) {
 
 	IOFUNC	iof;
 
-//	VERBOSE(("iocore_out8(%x, %x)", port, dat));
+//	TRACEOUT(("iocore_out8(%.2x, %.2x)", port, dat));
 	CPU_REMCLOCK -= iocore.busclock;
 	iof = iocore.base[(port >> 8) & 0xff];
 	iof->ioout[port & 0xff](port, dat);
@@ -494,18 +512,27 @@ void IOOUTCALL iocore_out8(UINT port, RE
 REG8 IOINPCALL iocore_inp8(UINT port) {
 
 	IOFUNC	iof;
+	REG8	ret;
 
-//	VERBOSE(("iocore_inp8(%x)", port));
 	CPU_REMCLOCK -= iocore.busclock;
 	iof = iocore.base[(port >> 8) & 0xff];
-	return(iof->ioinp[port & 0xff](port));
+	ret = iof->ioinp[port & 0xff](port);
+//	TRACEOUT(("iocore_inp8(%.2x) -> %.2x", port, ret));
+	return(ret);
 }
 
 void IOOUTCALL iocore_out16(UINT port, REG16 dat) {
 
 	IOFUNC	iof;
 
+//	TRACEOUT(("iocore_out16(%.4x, %.4x)", port, dat));
 	CPU_REMCLOCK -= iocore.busclock;
+#if defined(SUPPORT_IDEIO)
+	if (port == 0x0640) {
+		ideio_w16(port, dat);
+		return;
+	}
+#endif
 	if ((port & 0xfff1) == 0x04a0) {
 		egc_w16(port, dat);
 		return;
@@ -537,6 +564,11 @@ REG16 IOINPCALL iocore_inp16(UINT port) 
 	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));
 	}
@@ -570,14 +602,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));
 }