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

2023-08-16 14:05:00 -04:00
parent 218946e305 a942ee5ad9
commit 0ff2565125
40 changed files with 1086 additions and 629 deletions
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -166,7 +166,7 @@ machine_common_init(UNUSED(const machine_t *model))

    int pit_type = IS_AT(machine) ? PIT_8254 : PIT_8253;
    /* Select fast PIT if needed */
-    if ((pit_mode == -1 && is486) || pit_mode == 1)
+    if (((pit_mode == -1) && is486) || (pit_mode == 1))
        pit_type += 2;

    pit_common_init(pit_type, pit_irq0_timer, NULL);