--- np2/cbus/cbuscore.c	2004/01/22 01:10:03	1.2
+++ np2/cbus/cbuscore.c	2007/11/03 00:00:19	1.8
@@ -2,41 +2,54 @@
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"cbuscore.h"
+#include	"ideio.h"
 #include	"sasiio.h"
 #include	"scsiio.h"
 #include	"pc9861k.h"
 #include	"mpu98ii.h"
 
 
-static const IOCBFN resetfn[] = {
+static const FNIORESET resetfn[] = {
+#if defined(SUPPORT_IDEIO)
+			ideio_reset,
+#endif
 #if defined(SUPPORT_SASI)
 			sasiio_reset,
 #endif
 #if defined(SUPPORT_SCSI)
 			scsiio_reset,
 #endif
+#if defined(SUPPORT_PC9861K)
 			pc9861k_reset,
-			mpu98ii_reset};
+#endif
+			mpu98ii_reset,
+	};
 
-static const IOCBFN bindfn[] = {
+static const FNIOBIND bindfn[] = {
+#if defined(SUPPORT_IDEIO)
+			ideio_bind,
+#endif
 #if defined(SUPPORT_SASI)
 			sasiio_bind,
 #endif
 #if defined(SUPPORT_SCSI)
 			scsiio_bind,
 #endif
+#if defined(SUPPORT_PC9861K)
 			pc9861k_bind,
-			mpu98ii_bind};
+#endif
+			mpu98ii_bind,
+	};
 
 
-void cbuscore_reset(void) {
+void cbuscore_reset(const NP2CFG *pConfig) {
 
-	iocore_cb(resetfn, sizeof(resetfn)/sizeof(IOCBFN));
+	iocore_cbreset(resetfn, NELEMENTS(resetfn), pConfig);
 }
 
 void cbuscore_bind(void) {
 
-	iocore_cb(bindfn, sizeof(bindfn)/sizeof(IOCBFN));
+	iocore_cbbind(bindfn, NELEMENTS(bindfn));
 }