--- np2/fdd/diskdrv.c	2004/02/13 20:31:55	1.5
+++ np2/fdd/diskdrv.c	2005/05/14 19:41:25	1.13
@@ -7,19 +7,23 @@
 #include	"iocore.h"
 #include	"diskdrv.h"
 #include	"fddfile.h"
+#include	"sxsi.h"
 
 
 #define	DISK_DELAY	20			// (0.4sec)
 
 	int		diskdrv_delay[4];
+	OEMCHAR	diskdrv_fname[4][MAX_PATH];
+	UINT	diskdrv_ftype[4];
 	int		diskdrv_ro[4];
-	char	diskdrv_fname[4][MAX_PATH];
 
 
-void diskdrv_sethdd(REG8 drv, const char *fname) {
+// ---- sxsi
+
+void diskdrv_setsxsi(REG8 drv, const OEMCHAR *fname) {
 
 	UINT	num;
-	char	*p;
+	OEMCHAR	*p;
 	int		leng;
 
 	num = drv & 0x0f;
@@ -28,14 +32,14 @@ void diskdrv_sethdd(REG8 drv, const char
 	if (!(drv & 0x20)) {			// SASI or IDE
 		if (num < 2) {
 			p = np2cfg.sasihdd[num];
-			leng = sizeof(np2cfg.sasihdd[0]);
+			leng = NELEMENTS(np2cfg.sasihdd[0]);
 		}
 	}
 #if defined(SUPPORT_SCSI)
 	else {							// SCSI
 		if (num < 4) {
 			p = np2cfg.scsihdd[num];
-			leng = sizeof(np2cfg.scsihdd[0]);
+			leng = NELEMENTS(np2cfg.scsihdd[0]);
 		}
 	}
 #endif
@@ -48,21 +52,94 @@ void diskdrv_sethdd(REG8 drv, const char
 		}
 		sysmng_update(SYS_UPDATEHDD | SYS_UPDATECFG);
 	}
+	else {
+		sxsi_devopen(drv, fname);
+	}
+}
+
+OEMCHAR *diskdrv_getsxsi(REG8 drv) {
+
+	UINT	num;
+
+	num = drv & 0x0f;
+	if (!(drv & 0x20)) {			// SASI or IDE
+		if (num < 2) {
+			return(np2cfg.sasihdd[num]);
+		}
+	}
+#if defined(SUPPORT_SCSI)
+	else {							// SCSI
+		if (num < 4) {
+			return(np2cfg.scsihdd[num]);
+		}
+	}
+#endif
+	return(sxsi_getfilename(drv));
+}
+
+
+void diskdrv_hddbind(void) {
+
+	UINT	i;
+	REG8	drv;
+
+	drv = 0;
+	for (i=0; i<2; i++) {
+		sxsi_devclose(drv);
+		sxsi_setdevtype(drv, SXSIDEV_HDD);
+		if (sxsi_devopen(drv, np2cfg.sasihdd[i]) == SUCCESS) {
+			drv++;
+		}
+		else {
+			sxsi_setdevtype(drv, SXSIDEV_NC);
+		}
+	}
+#if defined(SUPPORT_SCSI)
+	drv = 0x20;
+	for (i=0; i<4; i++) {
+		sxsi_devclose(drv);
+		sxsi_setdevtype(drv, SXSIDEV_HDD);
+		if (sxsi_devopen(drv, np2cfg.scsihdd[i]) == SUCCESS) {
+			drv++;
+		}
+		else {
+			sxsi_setdevtype(drv, SXSIDEV_NC);
+		}
+	}
+#endif
+}
+
+// ---- fdd
+
+void diskdrv_readyfddex(REG8 drv, const OEMCHAR *fname,
+												UINT ftype, int readonly) {
+
+	if ((drv < 4) && (fdc.equip & (1 << drv))) {
+		if ((fname != NULL) && (fname[0] != '\0')) {
+			fdd_set(drv, fname, ftype, readonly);
+			fdc.stat[drv] = FDCRLT_AI | drv;
+			fdc_interrupt();
+			sysmng_update(SYS_UPDATEFDD);
+		}
+	}
 }
 
-void diskdrv_setfdd(REG8 drv, const char *fname, int readonly) {
+void diskdrv_setfddex(REG8 drv, const OEMCHAR *fname,
+												UINT ftype, int readonly) {
 
-	if (drv < 4) {
+	if ((drv < 4) && (fdc.equip & (1 << drv))) {
 		fdd_eject(drv);
 		diskdrv_delay[drv] = 0;
 		diskdrv_fname[drv][0] = '\0';
-		fdc.stat[drv] = FDCRLT_IC0 | FDCRLT_IC1 | FDCRLT_NR | drv;
+		fdc.stat[drv] = FDCRLT_AI | FDCRLT_NR | drv;
 		fdc_interrupt();
 
 		if (fname) {
 			diskdrv_delay[drv] = DISK_DELAY;
+			diskdrv_ftype[drv] = ftype;
 			diskdrv_ro[drv] = readonly;
-			file_cpyname(diskdrv_fname[drv], fname, sizeof(diskdrv_fname[0]));
+			file_cpyname(diskdrv_fname[drv], fname,
+												NELEMENTS(diskdrv_fname[0]));
 		}
 		sysmng_update(SYS_UPDATEFDD);
 	}
@@ -75,12 +152,10 @@ void diskdrv_callback(void) {
 	for (drv=0; drv<4; drv++) {
 		if (diskdrv_delay[drv]) {
 			diskdrv_delay[drv]--;
-			if ((!diskdrv_delay[drv]) && (diskdrv_fname[drv][0])) {
-				fdd_set(drv, diskdrv_fname[drv], FTYPE_NONE, diskdrv_ro[drv]);
+			if (!diskdrv_delay[drv]) {
+				diskdrv_readyfddex(drv, diskdrv_fname[drv],
+										diskdrv_ftype[drv], diskdrv_ro[drv]);
 				diskdrv_fname[drv][0] = '\0';
-				fdc.stat[drv] = FDCRLT_IC0 | FDCRLT_IC1 | drv;
-				fdc_interrupt();
-				sysmng_update(SYS_UPDATEFDD);
 			}
 		}
 	}