--- np2/fdd/fddfile.c 2004/01/27 07:51:49 1.3 +++ 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)); } @@ -75,12 +71,20 @@ const char *p; (!milstr_cmp(p, str_d98)) || (!milstr_cmp(p, str_98d))) { ftype = FTYPE_D88; } + else if (!milstr_cmp(p, str_fdi)) { + ftype = FTYPE_FDI; + } else { ftype = FTYPE_BETA; } } 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)); @@ -217,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) {