From 588c68c1a07ccbd68ed26773f72ab6a66b2c0497 Mon Sep 17 00:00:00 2001 From: Maxwell Scott Date: Thu, 12 Feb 2026 12:51:43 +0700 Subject: [PATCH] Machine changes (February 12, 2026) 1. Alphabetize IBM Multistation 5550 2. Rename changes related to Multitech machines --- src/machine/m_xt.c | 6 +-- src/machine/machine_table.c | 88 ++++++++++++++++++------------------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/machine/m_xt.c b/src/machine/m_xt.c index 6da39d997..3e1c78a03 100644 --- a/src/machine/m_xt.c +++ b/src/machine/m_xt.c @@ -1275,7 +1275,7 @@ static const device_config_t pc500_config[] = { }; const device_t pc500_device = { - .name = "Multitech PC-500", + .name = "Multitech PC-500 / Franklin PC 8000", .internal_name = "pc500_device", .flags = 0, .local = 0, @@ -1394,7 +1394,7 @@ static const device_config_t pc500plus_config[] = { }; const device_t pc500plus_device = { - .name = "Multitech PC-500 plus", + .name = "Multitech PC-500+", .internal_name = "pc500plus_device", .flags = 0, .local = 0, @@ -1472,7 +1472,7 @@ static const device_config_t pc700_config[] = { }; const device_t pc700_device = { - .name = "Multitech PC-700", + .name = "Multitech PC-700 / Siemens SICOMP PC 16 05", .internal_name = "pc700_device", .flags = 0, .local = 0, diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 45e3a0729..66d119520 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -1140,7 +1140,7 @@ const machine_t machines[] = { .net_device = NULL }, { - .name = "[8088] Multitech PC-500 plus", + .name = "[8088] Multitech PC-500+", .internal_name = "pc500plus", .type = MACHINE_TYPE_8088, .chipset = MACHINE_CHIPSET_DISCRETE, @@ -2689,6 +2689,49 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, + { + .name = "[8086] IBM Multistation 5550", + .internal_name = "ibm5550", + .type = MACHINE_TYPE_8086, + .chipset = MACHINE_CHIPSET_DISCRETE, + .init = machine_xt_ibm5550_init, + .p1_handler = NULL, + .gpio_handler = NULL, + .available_flag = MACHINE_AVAILABLE, + .gpio_acpi_handler = NULL, + .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_FIXED | MACHINE_KEYBOARD, + .ram = { + .min = 256, + .max = 640, + .step = 128 + }, + .nvrmask = 15, + .jumpered_ecp_dma = 0, + .default_jumpered_ecp_dma = -1, + .kbc_device = NULL, + .kbc_params = 0x00000000, + .kbc_p1 = 0xff, + .gpio = 0xffffffff, + .gpio_acpi = 0xffffffff, + .device = NULL, + .kbd_device = NULL, + .fdc_device = NULL, + .sio_device = NULL, + .vid_device = NULL, + .snd_device = NULL, + .net_device = NULL + }, { .name = "[8086] Mazovia 1016", .internal_name = "maz1016", @@ -3033,49 +3076,6 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, - { - .name = "[8086] IBM Multistation 5550", - .internal_name = "ibm5550", - .type = MACHINE_TYPE_8086, - .chipset = MACHINE_CHIPSET_DISCRETE, - .init = machine_xt_ibm5550_init, - .p1_handler = NULL, - .gpio_handler = NULL, - .available_flag = MACHINE_AVAILABLE, - .gpio_acpi_handler = NULL, - .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_FIXED | MACHINE_KEYBOARD, - .ram = { - .min = 256, - .max = 640, - .step = 128 - }, - .nvrmask = 15, - .jumpered_ecp_dma = 0, - .default_jumpered_ecp_dma = -1, - .kbc_device = NULL, - .kbc_params = 0x00000000, - .kbc_p1 = 0xff, - .gpio = 0xffffffff, - .gpio_acpi = 0xffffffff, - .device = NULL, - .kbd_device = NULL, - .fdc_device = NULL, - .sio_device = NULL, - .vid_device = NULL, - .snd_device = NULL, - .net_device = NULL - }, /* 286 AT machines */ /* Has IBM AT KBC firmware. */