Some machine ordering fixes (and a 286 machine had the wrong chipset displayed).

src/include/86box/machine.h

@@ -516,19 +516,19 @@ extern int             machine_at_dells200_init(const machine_t *);
 extern int             machine_at_super286c_init(const machine_t *);
 extern int             machine_at_at122_init(const machine_t *);
 extern int             machine_at_tuliptc7_init(const machine_t *);
+/* Wells American A*Star with custom award BIOS. */
+extern int             machine_at_wellamerastar_init(const machine_t *);
 
 /* GC103 */
 extern int             machine_at_quadt286_init(const machine_t *);
 extern void            machine_at_headland_common_init(const machine_t *model, int type);
 extern int             machine_at_tg286m_init(const machine_t *);
-/* Wells American A*Star with custom award BIOS. */
-extern int             machine_at_wellamerastar_init(const machine_t *);
 
 /* NEAT */
+extern int             machine_at_px286_init(const machine_t *);
 extern int             machine_at_ataripc4_init(const machine_t *);
 extern int             machine_at_neat_ami_init(const machine_t *);
 extern int             machine_at_3302_init(const machine_t *);
-extern int             machine_at_px286_init(const machine_t *);
 
 /* SCAMP */
 extern int             machine_at_pc7286_init(const machine_t *);
@@ -558,8 +558,8 @@ extern const device_t  pbl300sx_device;
 extern int             machine_at_pbl300sx_init(const machine_t *);
 
 /* ALi M1217 */
-extern int             machine_at_arb1374_init(const machine_t *);
 extern int             machine_at_sbc350a_init(const machine_t *);
+extern int             machine_at_arb1374_init(const machine_t *);
 extern int             machine_at_flytech386_init(const machine_t *);
 #ifdef EMU_DEVICE_H
 extern const device_t  c325ax_device;
@@ -609,6 +609,10 @@ extern int             machine_at_wd76c10_init(const machine_t *);
 extern int             machine_at_pja511m_init(const machine_t *);
 extern int             machine_at_prox1332_init(const machine_t *);
 
+/* m_at_486slc.c */
+/* OPTi 283 */
+extern int             machine_at_rycleopardlx_init(const machine_t *);
+
 /* m_at_386dx.c */
 /* ISA */
 #ifdef EMU_DEVICE_H
@@ -640,10 +644,6 @@ extern int             machine_at_opti495_init(const machine_t *);
 extern int             machine_at_asus3863364k_init(const machine_t *);
 extern int             machine_at_asus386_init(const machine_t *);
 
-/* m_at_486slc.c */
-/* OPTi 283 */
-extern int             machine_at_rycleopardlx_init(const machine_t *);
-
 /* m_at_386dx_486.c */
 /* ALi M1429G */
 extern int             machine_at_exp4349_init(const machine_t *);

src/machine/m_at_286.c

@@ -736,6 +736,28 @@ machine_at_tg286m_init(const machine_t *model)
     return ret;
 }
 
+int
+machine_at_px286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/px286/KENITEC.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&neat_device);
+
+    return ret;
+}
+
 // TODO
 // Onboard Paradise PVGA1A-JK VGA Graphics
 // Data Technology Corporation DTC7187 RLL Controller (Optional)
@@ -816,28 +838,6 @@ machine_at_3302_init(const machine_t *model)
     return ret;
 }
 
-int
-machine_at_px286_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/px286/KENITEC.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
-
-    if (fdc_current[0] == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&neat_device);
-
-    return ret;
-}
-
 /* SCAMP */
 int
 machine_at_pc7286_init(const machine_t *model)

src/machine/m_at_386sx.c

@@ -162,28 +162,6 @@ machine_at_pbl300sx_init(const machine_t *model)
 }
 
 /* ALi M1217 */
-int
-machine_at_arb1374_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/arb1374/1374s.rom",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&ali1217_device);
-    device_add(&ide_isa_device);
-    device_add_params(&w83877_device, (void *) (W83877F | W83877_3F0 | W83XX7_IDE_PRI));
-
-    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
-
-    return ret;
-}
-
 int
 machine_at_sbc350a_init(const machine_t *model)
 {
@@ -206,6 +184,28 @@ machine_at_sbc350a_init(const machine_t *model)
     return ret;
 }
 
+int
+machine_at_arb1374_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/arb1374/1374s.rom",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&ali1217_device);
+    device_add(&ide_isa_device);
+    device_add_params(&w83877_device, (void *) (W83877F | W83877_3F0 | W83XX7_IDE_PRI));
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
 int
 machine_at_flytech386_init(const machine_t *model)
 {

src/machine/machine_table.c

@@ -3916,6 +3916,49 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
+    /* has an Award-branded KBC controller */
+    {
+        .name = "[C&T PC/AT] Hyundai Super-286C",
+        .internal_name = "super286c",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_CT_AT,
+        .init = machine_at_super286c_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 512,
+            .max = 1024,
+            .step = 128
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AWARD | 0x00424600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
     /* No proper pictures of the KBC exist, though it seems to have the IBM AT KBC
        firmware. */
     {
@@ -4270,49 +4313,6 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* has an Award-branded KBC controller */
-    {
-        .name = "[NEAT] Hyundai Super-286C",
-        .internal_name = "super286c",
-        .type = MACHINE_TYPE_286,
-        .chipset = MACHINE_CHIPSET_NEAT,
-        .init = machine_at_super286c_init,
-        .p1_handler = machine_generic_p1_handler,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_286,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_AT,
-        .flags = MACHINE_FLAGS_NONE,
-        .ram = {
-            .min = 512,
-            .max = 1024,
-            .step = 128
-        },
-        .nvrmask = 127,
-        .jumpered_ecp_dma = 0,
-        .default_jumpered_ecp_dma = -1,
-        .kbc_device = &kbc_at_device,
-        .kbc_params = KBC_VEN_AWARD | 0x00424600,
-        .kbc_p1 = 0x000004f0,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
     /* Has NCR KBC firmware. */
     {
         .name = "[NEAT] NCR 3302",