Merge pull request #2757 from telanus/master

Sorted 8088 & 8086 entries alphabetically

src/machine/machine_table.c

@@ -1103,6 +1103,42 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
+    {
+        .name = "[8088] Pravetz 16 / IMKO-4",
+        .internal_name = "pravetz16",
+        .type = MACHINE_TYPE_8088,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_xt_pravetz16_imko4_init,
+        .pad = 0,
+        .pad0 = 0,
+        .pad1 = MACHINE_AVAILABLE,
+        .pad2 = 0,
+        .cpu = {
+            .package = CPU_PKG_8088,
+            .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_PC,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 64,
+            .max = 640,
+            .step = 64
+        },
+        .nvrmask = 0,
+        .kbc = KBC_IBM_PC_XT,
+        .kbc_p1 = 0xff00,
+        .gpio = 0xffffffff,
+        .device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
     {
         .name = "[8088] Sanyo SX-16",
         .internal_name = "sansx16",
@@ -1610,42 +1646,6 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
-    {
-        .name = "[8088] Pravetz 16 / IMKO-4",
-        .internal_name = "pravetz16",
-        .type = MACHINE_TYPE_8088,
-        .chipset = MACHINE_CHIPSET_DISCRETE,
-        .init = machine_xt_pravetz16_imko4_init,
-        .pad = 0,
-        .pad0 = 0,
-        .pad1 = MACHINE_AVAILABLE,
-        .pad2 = 0,
-        .cpu = {
-            .package = CPU_PKG_8088,
-            .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_PC,
-        .flags = MACHINE_FLAGS_NONE,
-        .ram = {
-            .min = 64,
-            .max = 640,
-            .step = 64
-        },
-        .nvrmask = 0,
-        .kbc = KBC_IBM_PC_XT,
-        .kbc_p1 = 0xff00,
-        .gpio = 0xffffffff,
-        .device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
     {
         .name = "[V20] PC-XT",
         .internal_name = "v20xt",
@@ -1936,6 +1936,42 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
+    {
+        .name = "[8086] Epson Equity LT",
+        .internal_name = "elt",
+        .type = MACHINE_TYPE_8086,
+        .chipset = MACHINE_CHIPSET_PROPRIETARY,
+        .init = machine_elt_init,
+        .pad = 0,
+        .pad0 = 0,
+        .pad1 = MACHINE_AVAILABLE,
+        .pad2 = 0,
+        .cpu = {
+            .package = CPU_PKG_8086,
+            .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_PC,
+        .flags = MACHINE_VIDEO,
+        .ram = {
+            .min = 640,
+            .max = 640,
+            .step = 640
+        },
+        .nvrmask = 0x3f,
+        .kbc = KBC_IBM_PC_XT,
+        .kbc_p1 = 0xff00,
+        .gpio = 0xffffffff,
+        .device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
     {
         .name = "[8086] Olivetti M21/24/24SP",
         .internal_name = "m24",
@@ -2081,42 +2117,6 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
-    {
-        .name = "[8086] Victor V86P",
-        .internal_name = "v86p",
-        .type = MACHINE_TYPE_8086,
-        .chipset = MACHINE_CHIPSET_PROPRIETARY,
-        .init = machine_v86p_init,
-        .pad = 0,
-        .pad0 = 0,
-        .pad1 = MACHINE_AVAILABLE,
-        .pad2 = 0,
-        .cpu = {
-            .package = CPU_PKG_8086,
-            .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_PC,
-        .flags = MACHINE_VIDEO | MACHINE_MFM,
-        .ram = {
-            .min = 512,
-            .max = 1024,
-            .step = 128
-        },
-        .nvrmask = 127,
-        .kbc = KBC_IBM_PC_XT,
-        .kbc_p1 = 0xff00,
-        .gpio = 0xffffffff,
-        .device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
     {
         .name = "[8086] Toshiba T1200",
         .internal_name = "t1200",
@@ -2154,11 +2154,11 @@ const machine_t machines[] = {
         .net_device = NULL
     },
     {
-        .name = "[8086] Epson Equity LT",
+        .name = "[8086] Victor V86P",
-        .internal_name = "elt",
+        .internal_name = "v86p",
         .type = MACHINE_TYPE_8086,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
-        .init = machine_elt_init,
+        .init = machine_v86p_init,
         .pad = 0,
         .pad0 = 0,
         .pad1 = MACHINE_AVAILABLE,
@@ -2174,13 +2174,13 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO,
+        .flags = MACHINE_VIDEO | MACHINE_MFM,
         .ram = {
-            .min = 640,
+            .min = 512,
-            .max = 640,
+            .max = 1024,
-            .step = 640
+            .step = 128
         },
-        .nvrmask = 0x3f,
+        .nvrmask = 127,
         .kbc = KBC_IBM_PC_XT,
         .kbc_p1 = 0xff00,
         .gpio = 0xffffffff,