--- xmil/fdd/fddfile.c	2004/08/01 05:31:30	1.1
+++ xmil/fdd/fddfile.c	2005/02/04 06:42:11	1.8
@@ -5,22 +5,90 @@
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"fddfile.h"
-#include	"x1_io.h"
-#include	"x1_fdc.h"
 #include	"fdd_2d.h"
 #include	"fdd_d88.h"
 
 
 	_FDDFILE	fddfile[MAX_FDDFILE];
 
-extern	BYTE		WRITEPT[];
-extern	BYTE		DISKNUM[];
 
+static REG8 dummyseek(FDDFILE fdd, REG8 media, UINT track) {
+
+	(void)fdd;
+	(void)media;
+	(void)track;
+	return(FDDSTAT_SEEKERR);
+}
+
+static REG8 dummyread(FDDFILE fdd, REG8 media, UINT track, REG8 sc,
+												UINT8 *ptr, UINT *size) {
+
+	(void)fdd;
+	(void)media;
+	(void)track;
+	(void)sc;
+	(void)ptr;
+	(void)size;
+	return(FDDSTAT_RECNFND);
+}
+
+static REG8 dummywrite(FDDFILE fdd, REG8 media, UINT track, REG8 sc,
+												const UINT8 *ptr, UINT size) {
+
+	(void)fdd;
+	(void)media;
+	(void)track;
+	(void)sc;
+	(void)ptr;
+	(void)size;
+	return(FDDSTAT_RECNFND | FDDSTAT_WRITEFAULT);
+}
+
+static REG8 dummycrc(FDDFILE fdd, REG8 media, UINT track, UINT num,
+												UINT8 *ptr) {
+
+	(void)fdd;
+	(void)media;
+	(void)track;
+	(void)num;
+	(void)ptr;
+	return(FDDSTAT_RECNFND);
+}
+
+static UINT32 getfdtype(const OEMCHAR *fname) {
+
+const OEMCHAR	*ext;
+
+	ext = file_getext(fname);
+	if ((!milstr_cmp(ext, str_d88)) || (!milstr_cmp(ext, str_88d))) {
+		return(FTYPE_D88);
+	}
+	return(FTYPE_BETA);
+}
+
+static void setempty(FDDFILE fdd) {
+
+	ZeroMemory(fdd, sizeof(_FDDFILE));
+	fdd->seek = dummyseek;
+	fdd->read = dummyread;
+	fdd->write = dummywrite;
+	fdd->wrtrk = dummywrite;
+	fdd->crc = dummycrc;
+}
+
+
+// ----
 
 void fddfile_initialize(void) {
+
+	UINT	i;
+
+	for (i=0; i<MAX_FDDFILE; i++) {
+		setempty(fddfile + i);
+	}
 }
 
-const OEMCHAR *fdd_diskname(REG8 drv) {
+const OEMCHAR *fddfile_diskname(REG8 drv) {
 
 	if (drv >= MAX_FDDFILE) {
 		return(str_null);
@@ -28,68 +96,73 @@ const OEMCHAR *fdd_diskname(REG8 drv) {
 	return(fddfile[drv].fname);
 }
 
-BRESULT fdd_diskready(REG8 drv) {
+BRESULT fddfile_diskready(REG8 drv) {
 
-	if ((drv >= MAX_FDDFILE) || (fddfile[drv].fname[0] == '\0')) {
+	if ((drv >= MAX_FDDFILE) || (fddfile[drv].type == DISKTYPE_NOTREADY)) {
 		return(FALSE);
 	}
 	return(TRUE);
 }
 
+BRESULT fddfile_diskprotect(REG8 drv) {
 
-// ----
-
-static REG8 getfdtype(const OEMCHAR *fname) {
-
-const char	*ext;
-
-	ext = file_getext(fname);
-	if (!milstr_cmp(ext, str_e2d)) {
-		return(DRV_FMT2D);
-	}
-	if ((!milstr_cmp(ext, str_d88)) || (!milstr_cmp(ext, str_88d))) {
-		return(DRV_FMT88);
+	if ((drv >= MAX_FDDFILE) || (!fddfile[drv].protect)) {
+		return(FALSE);
 	}
-	return(DRV_EMPTY);
+	return(TRUE);
 }
 
-BRESULT fdd_set(REG8 drv, const OEMCHAR *fname, UINT ftype, int ro) {
+BRESULT fddfile_set(REG8 drv, const OEMCHAR *fname, UINT32 ftype, int ro) {
+
+	FDDFILE	fdd;
+	BRESULT	r;
 
-	fdd_eject(drv);
 	if (drv >= MAX_FDDFILE) {
 		return(FAILURE);
 	}
-	switch(getfdtype(fname)) {
-		case DRV_EMPTY:
-			return(FAILURE);
-
-		case DRV_FMT2D:
-			return(fdd_set_2d(drv, fname));
+	fddfile_eject(drv);
+	fdd = fddfile + drv;
+	if (ftype == FTYPE_NONE) {
+		ftype = getfdtype(fname);
+	}
+	switch(ftype) {
+		case FTYPE_BETA:
+			r = fdd2d_set(fdd, fname);
+			break;
+
+		case FTYPE_D88:
+			r = fddd88_set(fdd, fname);
+			break;
 
 		default:
-			return(fdd_set_d88(drv, fname));
+			r = FAILURE;
+			break;
+	}
+	if (r == SUCCESS) {
+		fdd->ftype = ftype;
+		milstr_ncpy(fdd->fname, fname, NELEMENTS(fdd->fname));
+		if (ro) {
+			fdd->protect = TRUE;
+		}
 	}
-	return(FAILURE);
+	return(r);
 }
 
-BRESULT fdd_eject(REG8 drv) {
+void fddfile_eject(REG8 drv) {
 
-	FDDFILE		fdd;
+	FDDFILE	fdd;
 
 	if (drv >= MAX_FDDFILE) {
-		return(FAILURE);
+		return;
 	}
 	fdd = fddfile + drv;
-	switch(DISKNUM[drv]) {
-		case DRV_EMPTY:
-			return(FAILURE);
+	switch(fdd->type) {
+		case DISKTYPE_BETA:
+			fdd2d_eject(fdd);
 
-		case DRV_FMT2D:
-			return(fdd_eject_2d(drv));
-
-		default:
-			return(fdd_eject_d88(drv));
+		case DISKTYPE_D88:
+			fddd88_eject(fdd);
 	}
-	return(FAILURE);
+	setempty(fdd);
 }