diff --git a/src/sio_um8669f.c b/src/sio_um8669f.c index 207904299..8238ff5b4 100644 --- a/src/sio_um8669f.c +++ b/src/sio_um8669f.c @@ -237,6 +237,8 @@ uint8_t um8669f_read(uint16_t port, void *p) void um8669f_reset(void) { + fdc_t *temp_fdc = um8669f_global.fdc; + fdc_reset(um8669f_global.fdc); serial_remove(1); @@ -252,6 +254,8 @@ void um8669f_reset(void) memset(&um8669f_global, 0, sizeof(um8669f_t)); + um8669f_global.fdc = temp_fdc; + um8669f_global.locked = 1; io_removehandler(0x0279, 0x0001, NULL, NULL, NULL, um8669f_pnp_write, NULL, NULL, &um8669f_global); diff --git a/src/sio_w83877f.c b/src/sio_w83877f.c index 149222602..fe6edc20d 100644 --- a/src/sio_w83877f.c +++ b/src/sio_w83877f.c @@ -11,7 +11,7 @@ * Winbond W83877F Super I/O Chip * Used by the Award 430HX * - * Version: @(#)sio_w83877f.c 1.0.8 2018/01/16 + * Version: @(#)sio_w83877f.c 1.0.9 2018/01/20 * * Author: Miran Grca, * Copyright 2016-2018 Miran Grca. @@ -503,6 +503,7 @@ void w83877f_reset(void) fdc_reset(w83877f_fdc); + memset(w83877f_regs, 0, 0x2A); w83877f_regs[3] = 0x30; w83877f_regs[7] = 0xF5; w83877f_regs[9] = 0x0A; diff --git a/src/win/86Box.rc b/src/win/86Box.rc index 9a860661e..be0b5b9be 100644 --- a/src/win/86Box.rc +++ b/src/win/86Box.rc @@ -8,7 +8,7 @@ * * Application resource script for Windows. * - * Version: @(#)86Box.rc 1.0.23 2018/01/18 + * Version: @(#)86Box.rc 1.0.24 2018/01/19 * * Authors: Miran Grca, * Fred N. van Kempen, @@ -888,7 +888,7 @@ BEGIN IDS_2156 "%" PRIu64 IDS_2157 "%" PRIu64 " MB (CHS: %" PRIu64 ", %" PRIu64 ", %" PRIu64 ")" IDS_2158 "Floppy %i (%s): %ls" - IDS_2159"All floppy images (*.0??;*.12;*.144;*.360;*.720;*.86F;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMD;*.IMG;*.JSON;*.TD0;*.VFD;*.XDF)\0*.0??;*.12;*.144;*.360;*.720;*.86F;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMD;*.IMG;*.JSON;*.TD0;*.VFD;*.XDF\0Advanced sector-based images (*.IMD;*.TD0)\0*.IMD;*.JSON;*.TD0\0Basic sector-based images (*.0??;*.12;*.144;*.360;*.720;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMG;*.JSON;*.VFD;*.XDF)\0*.0??;*.12;*.144;*.360;*.720;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMG;*.JSON;*.VFD;*.XDF\0Flux images (*.FDI)\0*.FDI\0Surface-based images (*.86F)\0*.86F\0All files (*.*)\0*.*\0" + IDS_2159 "All images (*.0??;*.1??;*.360;*.720;*.86F;*.BIN;*.CQ?;*.DSK;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.XDF)\0*.0??;*.1??;*.360;*.720;*.86F;*.BIN;*.CQ?;*.DSK;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.XDF\0Advanced sector images (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Basic sector images (*.0??;*.1??;*.360;*.720;*.BIN;*.CQ?;*.DSK;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.360;*.720;*.BIN;*.CQ?;*.DSK;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Flux images (*.FDI)\0*.FDI\0Surface images (*.86F)\0*.86F\0All files (*.*)\0*.*\0" IDS_2160 "Configuration files (*.CFG)\0*.CFG\0All files (*.*)\0*.*\0" IDS_2161 "&New image..." IDS_2162 "&Existing image..." @@ -902,8 +902,8 @@ BEGIN IDS_2170 "Check BPB" IDS_2171 "Unable to initialize FluidSynth, make sure you have the following libraries\nin your 86Box folder:\n\nlibfluidsynth.dll\nlibglib-2.0-0.dll\nlibiconv-2.dll\nlibintl-8.dll\nlibpcre-1.dll" IDS_2172 "E&xport to 86F..." - IDS_2173 "Surface-based images (*.86F)\0*.86F\0" - IDS_2174 "All floppy images (*.86F;*.DSK;*.FDI;*.FLP;*.IMA;*.IMG;*.VFD)\0*.86F;*.DSK;*.FDI;*.FLP;*.IMA;*.IMG;*.VFD\0Basic sector-based images (*.DSK;*.FDI;*.FLP;*.IMA;*.IMG;*.VFD)\0*.DSK;*.FDI;*.FLP;*.IMA;*.IMG;*.VFD\0Surface-based images (*.86F)\0*.86F\0" + IDS_2173 "Surface images (*.86F)\0*.86F\0" + IDS_2174 "All images (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Basic sector images (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Surface images (*.86F)\0*.86F\0" IDS_4096 "Hard disk (%s)" IDS_4097 "%01i:%01i" @@ -915,7 +915,7 @@ BEGIN IDS_4103 "Add Existing Hard Disk" IDS_4104 "Attempting to create a HDI image larger than 4 GB" IDS_4105 "Attempting to create a spuriously large hard disk image" - IDS_4106 "Hard disk images (*.HDI;*.HDX;*.IMA;*.IMG)\0*.HDI;*.HDX;*.IMA;*.IMG\0All files (*.*)\0*.*\0" + IDS_4106 "Hard disk images (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0All files (*.*)\0*.*\0" IDS_4107 "Unable to open the file for read" IDS_4108 "Unable to open the file for write" IDS_4109 "HDI or HDX image with a sector size that is not 512 are not supported"