--- np2/io/iocore.c	2004/04/04 22:22:26	1.18
+++ np2/io/iocore.c	2005/02/12 12:40:39	1.21
@@ -67,10 +67,12 @@ static	UINT8		ioterminate[0x100];
 
 static void IOOUTCALL defout8(UINT port, REG8 dat) {
 
+#if !defined(DISABLE_SOUND)
 	if ((port & 0xfff0) == cs4231.port) {
 		cs4231io_w8(port, dat);
 		return;
 	}
+#endif
 	if ((port & 0xf0ff) == 0x801e) {
 		dipsw_w8(port, dat);
 		return;
@@ -80,9 +82,11 @@ static void IOOUTCALL defout8(UINT port,
 
 static REG8 IOINPCALL definp8(UINT port) {
 
+#if !defined(DISABLE_SOUND)
 	if ((port & 0xfff0) == cs4231.port) {
 		return(cs4231io_r8(port));
 	}
+#endif
 	if ((port & 0xf0ff) == 0x801e) {
 		return(dipsw_r8(port));
 	}
@@ -239,7 +243,7 @@ void iocore_attachsysinpex(UINT port, UI
 
 // ----
 
-static BOOL makesndiofunc(UINT port) {
+static BRESULT makesndiofunc(UINT port) {
 
 	IOFUNC	tbl[2];
 	UINT	num;
@@ -269,9 +273,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);
@@ -285,9 +289,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);
@@ -320,7 +324,7 @@ static IOFUNC getextiofunc(UINT port) {
 	return(iof);
 }
 
-BOOL iocore_attachout(UINT port, IOOUT func) {
+BRESULT iocore_attachout(UINT port, IOOUT func) {
 
 	IOFUNC	iof;
 
@@ -334,7 +338,7 @@ BOOL iocore_attachout(UINT port, IOOUT f
 	}
 }
 
-BOOL iocore_attachinp(UINT port, IOINP func) {
+BRESULT iocore_attachinp(UINT port, IOINP func) {
 
 	IOFUNC	iof;
 
@@ -359,7 +363,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 {
@@ -377,7 +381,7 @@ void iocore_destroy(void) {
 	ioc->iotbl = NULL;
 }
 
-BOOL iocore_build(void) {
+BRESULT iocore_build(void) {
 
 	IOCORE		ioc;
 	IOFUNC		cmn;
@@ -471,13 +475,13 @@ 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) {