Added emulation IDE PIO-only hard disks (affects hard disk bus type in the configuration files - make sure to correct it in Settings after loading a configuration file from previous 86Box builds);

The IDENTIFY PACKET DEVICE command of ATAPI PIO-only drives now behaves like that of mainline PCem ATAPI CD-ROM's;
Added two functions in win.c for waltje for updating the status bar text;
The configuration loader now does sanity checks on most loaded values.
This commit is contained in:
OBattler
2017-05-10 02:46:01 +02:00
parent 95d201d4fd
commit ff8186741a
10 changed files with 217 additions and 97 deletions

View File

@@ -514,12 +514,14 @@ END
163 ICON DISCARDABLE "ICONS/cdrom_atapi_dma_active.ico"
164 ICON DISCARDABLE "ICONS/cdrom_scsi.ico"
165 ICON DISCARDABLE "ICONS/cdrom_scsi_active.ico"
176 ICON DISCARDABLE "ICONS/hard_disk.ico"
177 ICON DISCARDABLE "ICONS/hard_disk_active.ico"
178 ICON DISCARDABLE "ICONS/hard_disk_ide.ico"
179 ICON DISCARDABLE "ICONS/hard_disk_ide_active.ico"
180 ICON DISCARDABLE "ICONS/hard_disk_scsi.ico"
181 ICON DISCARDABLE "ICONS/hard_disk_scsi_active.ico"
176 ICON DISCARDABLE "ICONS/hard_disk_mfm.ico"
177 ICON DISCARDABLE "ICONS/hard_disk_mfm_active.ico"
178 ICON DISCARDABLE "ICONS/hard_disk.ico"
179 ICON DISCARDABLE "ICONS/hard_disk_active.ico"
180 ICON DISCARDABLE "ICONS/hard_disk_ide.ico"
181 ICON DISCARDABLE "ICONS/hard_disk_ide_active.ico"
182 ICON DISCARDABLE "ICONS/hard_disk_scsi.ico"
183 ICON DISCARDABLE "ICONS/hard_disk_scsi_active.ico"
256 ICON DISCARDABLE "ICONS/machine.ico"
257 ICON DISCARDABLE "ICONS/video.ico"
258 ICON DISCARDABLE "ICONS/input_devices.ico"
@@ -660,7 +662,7 @@ BEGIN
2048 "86Box"
IDS_STRING2049 "86Box Error"
IDS_STRING2050 "86Box Fatal Error"
IDS_STRING2051 "This will reset 86Box.\nDo you want to save the settings?"
IDS_STRING2051 "This will reset 86Box.\nAre you sure you want to save the settings?"
IDS_STRING2052 "DirectDraw Screenshot Error"
IDS_STRING2053 "Invalid number of sectors (valid values are between 1 and 63)"
IDS_STRING2054 "Invalid number of heads (valid values are between 1 and 16)"
@@ -790,17 +792,17 @@ BEGIN
2154 "Internal IDE"
2155 "IRQ %i"
2156 "MFM (%01i:%01i)"
2157 "IDE (%01i:%01i)"
2157 "IDE (PIO+DMA) (%01i:%01i)"
2158 "SCSI (%02i:%02i)"
2159 "IDE (PIO-only)"
2159 "Invalid number of cylinders (valid values are between 1 and 1023)"
2160 "%" PRIu64
2161 "Genius Bus mouse"
2162 "Amstrad mouse"
2163 "Attempting to create a spuriously large hard disk image"
2164 "Invalid number of sectors (valid values are between 1 and 99)"
2165 "Invalid number of cylinders (valid values are between 1 and 1023)"
2166 "MFM"
2167 "IDE"
2165 "MFM"
2166 "IDE (PIO-only)"
2167 "IDE (PIO and DMA)"
2168 "SCSI"
2169 "%01i:%01i"
2170 "Custom..."
@@ -811,12 +813,12 @@ BEGIN
2175 "CD-ROM image (*.ISO;*.CUE)\0*.ISO;*.CUE\0All files (*.*)\0*.*\0"
2176 "Use CTRL + ALT + PAGE DOWN to return to windowed mode"
2177 "Olivetti M24 mouse"
2178 "<Placeholder string>"
2178 "This image exists and will be overwritten.\nAre you sure you want to use it?"
2179 "Floppy %i (%s): %ws"
2180 "CD-ROM %i: %ws"
2181 "Removable disk %i: %s"
2182 "MFM hard disk"
2183 "IDE hard disk"
2181 "MFM hard disk"
2182 "IDE hard disk (PIO-only)"
2183 "IDE hard disk (PIO and DMA)"
2184 "SCSI hard disk"
2185 "(empty)"
2186 "(host drive %c:)"
@@ -828,7 +830,11 @@ BEGIN
2192 "ATAPI (PIO and DMA) (%01i:%01i)"
2193 "Use CTRL + ALT + PAGE DOWN to return to windowed mode"
2194 "Unable to create bitmap file: %s"
2195 "English (United States)"
2195 "IDE (PIO-only) (%01i:%01i)"
2196 "Add New Hard Disk"
2197 "Add Existing Hard Disk"
2198 "Removable disk %i: %s"
2199 "English (United States)"
END