Merge branch 'master' of ssh://github.com/86Box/86Box into version/4.1

src/machine/m_xt.c

@@ -493,6 +493,14 @@ machine_xt_vendex_init(const machine_t *model)
     return ret;
 }
 
+static void
+machine_xt_hyundai_common_init(const machine_t *model)
+{
+    device_add(&keyboard_xt_hyundai_device);
+
+    machine_xt_common_init(model);
+}
+
 int
 machine_xt_super16t_init(const machine_t *model)
 {
@@ -504,7 +512,7 @@ machine_xt_super16t_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_xt_clone_init(model);
+    machine_xt_hyundai_common_init(model);
 
     /* On-board FDC cannot be disabled */
     device_add(&fdc_xt_device);
@@ -523,7 +531,7 @@ machine_xt_super16te_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_xt_clone_init(model);
+    machine_xt_hyundai_common_init(model);
 
     /* On-board FDC cannot be disabled */
     device_add(&fdc_xt_device);

src/machine/m_xt_zenith.c

@@ -112,12 +112,8 @@ static const device_t zenith_scratchpad_device = {
 void
 machine_zenith_init(const machine_t *model)
 {
-
     machine_common_init(model);
 
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_xt_device);
-
     device_add(&zenith_scratchpad_device);
 
     pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
@@ -144,6 +140,9 @@ machine_xt_z184_init(const machine_t *model)
 
     machine_zenith_init(model);
 
+    if (fdc_type == FDC_INTERNAL)
+        device_add(&fdc_xt_device);
+
     lpt1_remove(); /* only one parallel port */
     lpt2_remove();
     lpt1_init(0x278);
@@ -171,6 +170,9 @@ machine_xt_z151_init(const machine_t *model)
 
     machine_zenith_init(model);
 
+    if (fdc_type == FDC_INTERNAL)
+        device_add(&fdc_xt_tandy_device);
+
     return ret;
 }
 
@@ -191,6 +193,9 @@ machine_xt_z159_init(const machine_t *model)
 
     machine_zenith_init(model);
 
+    if (fdc_type == FDC_INTERNAL)
+        device_add(&fdc_xt_tandy_device);
+
     /* parallel port is on the memory board */
     lpt1_remove(); /* only one parallel port */
     lpt2_remove();

src/machine/machine.c

@@ -168,13 +168,15 @@ pit_irq0_timer(int new_out, int old_out)
 void
 machine_common_init(UNUSED(const machine_t *model))
 {
+    uint8_t cpu_requires_fast_pit = is486 || (is8086 && (cpu_s->rspeed >= 8000000));
+
     /* System devices first. */
     pic_init();
     dma_init();
 
     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) && cpu_requires_fast_pit) || (pit_mode == 1))
         pit_type += 2;
 
     pit_common_init(pit_type, pit_irq0_timer, NULL);

src/machine/machine_table.c

@@ -1083,7 +1083,7 @@ const machine_t machines[] = {
         .ram = {
             .min = 256,
             .max = 640,
-            .step = 256
+            .step = 128
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xt_olivetti_device,
@@ -1161,7 +1161,7 @@ const machine_t machines[] = {
         .ram = {
             .min = 256,
             .max = 640,
-            .step = 256
+            .step = 128
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
@@ -1317,7 +1317,7 @@ const machine_t machines[] = {
         .ram = {
             .min = 256,
             .max = 640,
-            .step = 256
+            .step = 128
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,