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

Merge branch '86Box:master' into pc140_6260

Browse Source
This commit is contained in:
rue
2024-05-09 19:58:42 +03:00
committed by GitHub
parent 544ea87764 62193ab259
commit f95852c19f
28 changed files with 562 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/machine/machine_table.c
View File

@@ -6522,10 +6522,10 @@ const machine_t machines[] = {
.kbc_p1 = 0xff,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = &gd5428_vlb_onboard_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &gd5428_vlb_onboard_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -6804,10 +6804,10 @@ const machine_t machines[] = {
.kbc_p1 = 0xff,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = &s3_phoenix_trio32_onboard_vlb_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &s3_phoenix_trio32_onboard_vlb_device,
.snd_device = NULL,
.net_device = NULL
},