--- np2/fdd/fddfile.c	2004/01/27 10:55:47	1.4
+++ np2/fdd/fddfile.c	2005/02/07 14:46:09	1.8
@@ -10,16 +10,12 @@
 
 
 	_FDDFILE	fddfile[MAX_FDDFILE];
-	BYTE		fddlasterror;
-
-
-static const char str_88d[] = "88d";
-static const char str_98d[] = "98d";
+	UINT8		fddlasterror;
 
 
 // ----
 
-void fddfile_init(void) {
+void fddfile_initialize(void) {
 
 	ZeroMemory(fddfile, sizeof(fddfile));
 }
@@ -84,12 +80,14 @@ const char		*p;
 	}
 	fdd = fddfile + drv;
 	switch(ftype) {
+		case FTYPE_FDI:
+			if (fddxdf_setfdi(fdd, fname, ro) == SUCCESS) {
+				return(SUCCESS);
+			}
+
 		case FTYPE_BETA:
 			return(fddxdf_set(fdd, fname, ro));
 
-		case FTYPE_FDI:
-			return(fddxdf_setfdi(fdd, fname, ro));
-
 		case FTYPE_D88:
 			return(fddd88_set(fdd, fname, ro));
 	}
@@ -223,7 +221,7 @@ BOOL fdd_formatinit(void) {
 	return(FAILURE);
 }
 
-BOOL fdd_formating(const BYTE *ID) {
+BOOL fdd_formating(const UINT8 *ID) {
 
 	sysmng_fddaccess(fdc.us);
 	if (fddfile[fdc.us].type == DISKTYPE_D88) {