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

2026-02-24 20:35:32 -07:00 · 2022-12-18 15:42:47 -05:00
parent cc42484e6f dc1dff8211
commit e05bfc96b4
29 changed files with 192 additions and 134 deletions
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -10554,7 +10554,7 @@ const machine_t machines[] = {
            .max = 1572864,
            .step = 8192
        },
-        255,
+        .nvrmask = 255,
        .kbc = KBC_UNKNOWN,
        .kbc_p1 = 0,
        .gpio = 0,