mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-21 17:15:32 -07:00
Code Issues Packages Projects Releases Activity

Merge branch '86Box:master' into broken-sensation1

Browse Source
This commit is contained in:
win2kgamer
2026-01-30 21:18:03 -06:00
committed by GitHub
parent 4389231cc0 561a7171c3
commit be38bee2c6
73 changed files with 9211 additions and 3302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/machine/machine_table.c
View File

@@ -2982,7 +2982,7 @@ const machine_t machines[] = {
.kbc_p1 = 0xff,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = NULL,
.device = &v86p_device,
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
@@ -18561,7 +18561,7 @@ const machine_t machines[] = {
.max_multi = 5.0
},
.bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
.flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
.flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
.ram = {
.min = 8192,
.max = 262144,