--- np2/fdd/diskdrv.c 2005/02/09 20:11:34 1.8 +++ np2/fdd/diskdrv.c 2005/03/22 04:03:15 1.11 @@ -12,8 +12,9 @@ #define DISK_DELAY 20 // (0.4sec) int diskdrv_delay[4]; - int diskdrv_ro[4]; OEMCHAR diskdrv_fname[4][MAX_PATH]; + UINT diskdrv_ftype[4]; + int diskdrv_ro[4]; void diskdrv_sethdd(REG8 drv, const OEMCHAR *fname) { @@ -50,7 +51,21 @@ void diskdrv_sethdd(REG8 drv, const OEMC } } -void diskdrv_setfdd(REG8 drv, const OEMCHAR *fname, int readonly) { +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_setfddex(REG8 drv, const OEMCHAR *fname, + UINT ftype, int readonly) { if ((drv < 4) && (fdc.equip & (1 << drv))) { fdd_eject(drv); @@ -61,8 +76,10 @@ void diskdrv_setfdd(REG8 drv, const OEMC if (fname) { diskdrv_delay[drv] = DISK_DELAY; + diskdrv_ftype[drv] = ftype; diskdrv_ro[drv] = readonly; - file_cpyname(diskdrv_fname[drv], fname, NELEMENTS(diskdrv_fname[0])); + file_cpyname(diskdrv_fname[drv], fname, + NELEMENTS(diskdrv_fname[0])); } sysmng_update(SYS_UPDATEFDD); } @@ -75,12 +92,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_AI | drv; - fdc_interrupt(); - sysmng_update(SYS_UPDATEFDD); } } }