Merge remote-tracking branch 'origin/master' into version/4.1

2023-08-12 00:32:00 +02:00
parent 3ed97d6db3 c166db004e
commit 956788f3ef
20 changed files with 2660 additions and 2119 deletions
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -7754,7 +7754,7 @@ const machine_t machines[] = {
            .max_multi = MACHINE_MULTIPLIER_FIXED
        },
        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM | MACHINE_ACPI,
        .ram = {
            .min = 2048,
            .max = 131072,
@@ -7764,7 +7764,7 @@ const machine_t machines[] = {
        .kbc_device = NULL,
        .kbc_p1 = 0,
        .gpio = 0,
-        .device = NULL,
+        .device = &mach32_onboard_pci_device,
        .fdc_device = NULL,
        .sio_device = NULL,
        .vid_device = NULL,