claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved the SCSI BIOS command handler to its own file (scsi_bios_command.c/h);

Browse Source 
Removed all the SCSI BIOS ID/LUN swapping nonsense as it's no longer needed;
The makefile now knows the .h dependencies for everything in SOUND/;
Moved hdd*.* and scsi*.* to the HDD and SCSI subdirectories, respectively;
Fixed some leftover path name miscapitalizations in the makefile;
BT-542B is now BT-545C and BT-946C is now BT-958D again;
Implemented the last missing commands for the BT-958D;
MUNT and network are now optional at compile time but enabled by default;
When compiling the development branch, you now have to choose what of (Pro Audio Spectrum 16, Cirrus Logic, NVidia Riva) you want your binary to include.
This commit is contained in:
OBattler
2017-08-27 00:58:44 +02:00
parent b25ee43202
commit ee4af98e1f
46 changed files with 1083 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/WIN/86Box.rc
View File

@@ -8,7 +8,7 @@
*
* Windows resource script.
*
* Version: @(#)86Box.rc 1.0.6 2017/08/24
* Version: @(#)86Box.rc 1.0.7 2017/08/26
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
@@ -131,9 +131,11 @@ BEGIN
# ifdef ENABLE_SERIAL_LOG
MENUITEM "Enable Serial Port logs\tCtrl+F3", IDM_LOG_SERIAL
# endif
#ifdef USE_NETWORK
# ifdef ENABLE_NIC_LOG
MENUITEM "Enable Network logs\tCtrl+F9", IDM_LOG_NIC
# endif
#endif
# ifdef ENABLE_LOG_COMMANDS
# ifdef ENABLE_LOG_TOGGLES
MENUITEM SEPARATOR
@@ -336,6 +338,7 @@ BEGIN
BS_AUTOCHECKBOX | WS_TABSTOP,7,99,94,10
END
#ifdef USE_NETWORK
DLG_CFG_NETWORK DIALOG DISCARDABLE 97, 0, 267, 63
STYLE DS_CONTROL | WS_CHILD
FONT 9, "Segoe UI"
@@ -353,6 +356,7 @@ BEGIN
WS_TABSTOP
PUSHBUTTON "Configure",IDC_CONFIGURE_NET,214,43,46,12
END
#endif
DLG_CFG_PERIPHERALS DIALOG DISCARDABLE 97, 0, 267, 115
STYLE DS_CONTROL | WS_CHILD
@@ -515,16 +519,24 @@ END
177 ICON DISCARDABLE "WIN/ICONS/removable_disk_active.ico"
192 ICON DISCARDABLE "WIN/ICONS/hard_disk.ico"
193 ICON DISCARDABLE "WIN/ICONS/hard_disk_active.ico"
#ifdef USE_NETWORK
208 ICON DISCARDABLE "WIN/ICONS/network.ico"
209 ICON DISCARDABLE "WIN/ICONS/network_active.ico"
#endif
256 ICON DISCARDABLE "WIN/ICONS/machine.ico"
257 ICON DISCARDABLE "WIN/ICONS/display.ico"
258 ICON DISCARDABLE "WIN/ICONS/input_devices.ico"
259 ICON DISCARDABLE "WIN/ICONS/sound.ico"
#ifdef USE_NETWORK
260 ICON DISCARDABLE "WIN/ICONS/network.ico"
261 ICON DISCARDABLE "WIN/ICONS/other_peripherals.ico"
262 ICON DISCARDABLE "WIN/ICONS/hard_disk.ico"
263 ICON DISCARDABLE "WIN/ICONS/removable_devices.ico"
#else
260 ICON DISCARDABLE "WIN/ICONS/other_peripherals.ico"
261 ICON DISCARDABLE "WIN/ICONS/hard_disk.ico"
262 ICON DISCARDABLE "WIN/ICONS/removable_devices.ico"
#endif
384 ICON DISCARDABLE "WIN/ICONS/floppy_525_empty.ico"
385 ICON DISCARDABLE "WIN/ICONS/floppy_525_empty_active.ico"
400 ICON DISCARDABLE "WIN/ICONS/floppy_35_empty.ico"
@@ -615,6 +627,7 @@ BEGIN
BOTTOMMARGIN, 109
END
#ifdef USE_NETWORK
CONFIGUREDLG_NETWORK, DIALOG
BEGIN
LEFTMARGIN, 7
@@ -622,6 +635,7 @@ BEGIN
TOPMARGIN, 7
BOTTOMMARGIN, 56
END
#endif
CONFIGUREDLG_PERIPHERALS, DIALOG
BEGIN
@@ -682,10 +696,16 @@ BEGIN
IDS_2066 "Display"
IDS_2067 "Input devices"
IDS_2068 "Sound"
#ifdef USE_NETWORK
IDS_2069 "Network"
IDS_2070 "Other peripherals"
IDS_2071 "Hard disks"
IDS_2072 "Removable devices"
#else
IDS_2069 "Other peripherals"
IDS_2070 "Hard disks"
IDS_2071 "Removable devices"
#endif
IDS_2073 "Unable to create bitmap file: %s"
IDS_2074 "Use CTRL+ALT+PAGE DOWN to return to windowed mode"
IDS_2075 "CD-ROM images (*.ISO;*.CUE)\0*.ISO;*.CUE\0All files (*.*)\0*.*\0"
@@ -769,9 +789,11 @@ END
STRINGTABLE DISCARDABLE
BEGIN
#ifdef USE_NETWORK
IDS_2139 "PCap failed to set up because it may not be initialized"
IDS_2140 "No PCap devices found"
IDS_2141 "Invalid PCap device"
#endif
IDS_2142 "&Notify disk change"
IDS_2143 "Type"
IDS_2144 "Standard 2-button joystick(s)"