Merge remote-tracking branch 'upstream/master' into feature/mtrr

2026-02-25 04:45:31 -07:00 · 2022-12-18 15:40:55 -05:00
parent 35084febed dc1dff8211
commit ed4b341893
30 changed files with 194 additions and 129 deletions
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -10553,7 +10553,7 @@ const machine_t machines[] = {
            .max = 1572864,
            .step = 8192
        },
-        255,
+        .nvrmask = 255,
        .kbc = KBC_UNKNOWN,
        .kbc_p1 = 0,
        .gpio = 0,