mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-21 09:05:32 -07:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/master' into ls120

Browse Source
This commit is contained in:
OBattler
2026-02-12 11:42:07 +01:00
parent 58d6ce6a4f b39294d985
commit 8623a4bc0c
2 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/machine/m_xt.c
View File

@@ -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,

88
src/machine/machine_table.c
View File

@@ -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. */