Merge branch 'master' into feature/ich2

2026-02-24 10:28:19 -07:00 · 2022-07-27 20:39:49 -04:00
parent edd13a93db 42f0efeb9d
commit 8e31ca0197
123 changed files with 29984 additions and 31599 deletions
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -665,21 +665,21 @@ const machine_t machines[] = {
            .max_voltage = 0,
            .min_multi = 0,
            .max_multi = 0,
-		},
+        },
        .bus_flags = MACHINE_PC,
        .flags = MACHINE_FLAGS_NONE,
        .ram = {
            .min = 128,
            .max = 640,
            .step = 64,
-		},
+        },
        .nvrmask = 0,
        .kbc = KBC_IBM_PC_XT,
        .kbc_p1 = 0xff00,
        .gpio = 0xffffffff,
        .device = NULL,
        .vid_device = NULL
-	},
+    },
    {
        .name = "[8088] Multitech PC-500",
        .internal_name = "pc500",