From bb83a5c1fb2ad58979940396a88956eae53b0dfe Mon Sep 17 00:00:00 2001 From: Maxwell Scott Date: Wed, 14 Jan 2026 00:56:35 +0700 Subject: [PATCH] MS-6117 corrections + BIOS names sorted According to this machine's manual. --- src/machine/m_at_slot1.c | 60 ++++++++++++++++++------------------- src/machine/machine_table.c | 10 +++---- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/machine/m_at_slot1.c b/src/machine/m_at_slot1.c index eb975de7e..a05642e9b 100644 --- a/src/machine/m_at_slot1.c +++ b/src/machine/m_at_slot1.c @@ -320,7 +320,7 @@ static const device_config_t ms6117_config[] = { .selection = { { 0 } }, .bios = { { - .name = "AMIBIOS 6 (071595) - Revision 2.0 (latest)", + .name = "AMIBIOS 6 (071595) - Revision 2.0", .internal_name = "ms6117a", .bios_type = BIOS_NORMAL, .files_no = 1, @@ -328,24 +328,6 @@ static const device_config_t ms6117_config[] = { .size = 131072, .files = { "roms/machines/ms6117/A617MS20.ROM", "" } }, - { - .name = "AMIBIOS 6 (071595) - Revision 4.10tc (Traditional Chinese)", - .internal_name = "ms6117atc", - .bios_type = BIOS_NORMAL, - .files_no = 1, - .local = 0, - .size = 131072, - .files = { "roms/machines/ms6117/A617C410.ROM", "" } - }, - { - .name = "AMIBIOS 6 (071595) - Revision 3.11sc (Simplified Chinese)", - .internal_name = "ms6117asc", - .bios_type = BIOS_NORMAL, - .files_no = 1, - .local = 0, - .size = 131072, - .files = { "roms/machines/ms6117/A617C311.ROM", "" } - }, { .name = "AMIBIOS 6 (071595) - Revision 1.10j (Japanese)", .internal_name = "ms6117aj", @@ -356,7 +338,25 @@ static const device_config_t ms6117_config[] = { .files = { "roms/machines/ms6117/A617J110.ROM", "" } }, { - .name = "Award Modular BIOS v4.51PG - Revision 3.2 (Latest)", + .name = "AMIBIOS 6 (071595) - Revision 3.11sc (Simplified Chinese)", + .internal_name = "ms6117asc", + .bios_type = BIOS_NORMAL, + .files_no = 1, + .local = 0, + .size = 131072, + .files = { "roms/machines/ms6117/A617C311.ROM", "" } + }, + { + .name = "AMIBIOS 6 (071595) - Revision 4.10tc (Traditional Chinese)", + .internal_name = "ms6117atc", + .bios_type = BIOS_NORMAL, + .files_no = 1, + .local = 0, + .size = 131072, + .files = { "roms/machines/ms6117/A617C410.ROM", "" } + }, + { + .name = "Award Modular BIOS v4.51PG - Revision 3.2", .internal_name = "ms6117w", .bios_type = BIOS_NORMAL, .files_no = 1, @@ -373,15 +373,6 @@ static const device_config_t ms6117_config[] = { .size = 262144, .files = { "roms/machines/ms6117/611732x_patched.BIN", "" } }, - { - .name = "Award Modular BIOS v4.51PG - Revision 1.5 (Viglen Vig67M)", - .internal_name = "ms6117wvi", - .bios_type = BIOS_NORMAL, - .files_no = 1, - .local = 0, - .size = 131072, - .files = { "roms/machines/ms6117/w617v115.BIN", "" } - }, { .name = "Award Modular BIOS v4.51PG - Revision 1.4 (Fujitsu-Siemens OEM)", .internal_name = "ms6117wfs", @@ -400,6 +391,15 @@ static const device_config_t ms6117_config[] = { .size = 262144, .files = { "roms/machines/ms6117/BIOS.BIN", "" } }, + { + .name = "Award Modular BIOS v4.51PG - Revision 1.5 (Viglen Vig67M)", + .internal_name = "ms6117wvi", + .bios_type = BIOS_NORMAL, + .files_no = 1, + .local = 0, + .size = 131072, + .files = { "roms/machines/ms6117/w617v115.BIN", "" } + }, { .files_no = 0 } } }, @@ -951,7 +951,7 @@ static const device_config_t ga686_config[] = { .files = { "roms/machines/686bx/31nologo.bin", "" } }, { - .name = "Award Modular BIOS v4.51PG - Revision F1 (Latest)", + .name = "Award Modular BIOS v4.51PG - Revision F1", .internal_name = "686bx_f1", .bios_type = BIOS_NORMAL, .files_no = 1, diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 0533af51e..51ff3a30f 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -18233,18 +18233,18 @@ const machine_t machines[] = { .cpu = { .package = CPU_PKG_SLOT1, .block = CPU_BLOCK_NONE, - .min_bus = 60000000, - .max_bus = 83333333, - .min_voltage = 1500, + .min_bus = 66666667, + .max_bus = 75000000, + .min_voltage = 1800, .max_voltage = 3500, .min_multi = 2.0, - .max_multi = 5.5 + .max_multi = 8.0 }, .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB, .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB, .ram = { .min = 8192, - .max = 786432, + .max = 1048576, .step = 8192 }, .nvrmask = 255,