From bf1fbd570321aaef6eec8d34d013cd7ca206b955 Mon Sep 17 00:00:00 2001 From: Kotochi <185547947+rushieda@users.noreply.github.com> Date: Sat, 8 Nov 2025 21:27:59 +0300 Subject: [PATCH] Add the MSI MS-6199VA and fix a mistake with the MS-6318 --- src/include/86box/machine.h | 4 ++ src/machine/m_at_slot1.c | 113 +++++++++++++++++++++++++++++++++++ src/machine/m_at_socket370.c | 6 +- src/machine/machine_table.c | 49 +++++++++++++++ 4 files changed, 169 insertions(+), 3 deletions(-) diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index 878683217..6834334f3 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -1251,6 +1251,10 @@ extern int machine_at_ficka6130_init(const machine_t *); /* VIA Apollo Pro 133 */ extern int machine_at_p3v133_init(const machine_t *); +#ifdef EMU_DEVICE_H +extern const device_t ms6199va_device; +#endif +extern int machine_at_ms6199va_init(const machine_t *); /* VIA Apollo Pro 133A */ extern int machine_at_p3v4x_init(const machine_t *); diff --git a/src/machine/m_at_slot1.c b/src/machine/m_at_slot1.c index 0c777c349..e040265e3 100644 --- a/src/machine/m_at_slot1.c +++ b/src/machine/m_at_slot1.c @@ -1399,6 +1399,119 @@ machine_at_p3v133_init(const machine_t *model) return ret; } +static const device_config_t ms6199va_config[] = { + // clang-format off + { + .name = "bios", + .description = "BIOS Version", + .type = CONFIG_BIOS, + .default_string = "ms6199va", + .default_int = 0, + .file_filter = NULL, + .spinner = { 0 }, + .selection = { { 0 } }, + .bios = { + { + .name = "Award Modular BIOS v4.51PG - Revision 3.5", + .internal_name = "ms6199va", + .bios_type = BIOS_NORMAL, + .files_no = 1, + .local = 0, + .size = 262144, + .files = { "roms/machines/ms6199va/w6199vms.350", "" } + }, + { + .name = "Award Modular BIOS v4.51PG - Revision 2.0 (Compaq OEM)", + .internal_name = "ms6199va_200", + .bios_type = BIOS_NORMAL, + .files_no = 1, + .local = 0, + .size = 262144, + .files = { "roms/machines/ms6199va/W6199VC8.BIN", "" } + }, + { + .name = "Award Modular BIOS v4.51PG - Revision 2.0 (Compaq OEM) [patched for large drives]", + .internal_name = "ms6199va_200p", + .bios_type = BIOS_NORMAL, + .files_no = 1, + .local = 0, + .size = 262144, + .files = { "roms/machines/ms6199va/W6199VC8.PCD", "" } + }, + { + .name = "Award Modular BIOS v4.51PG - Revision 3.7 (Packard Bell OEM)", + .internal_name = "ms6199va_370", + .bios_type = BIOS_NORMAL, + .files_no = 1, + .local = 0, + .size = 262144, + .files = { "roms/machines/ms6199va/w6199VP2.370", "" } + }, + { .files_no = 0 } + } + }, + { .name = "", .description = "", .type = CONFIG_END } + // clang-format on +}; + +const device_t ms6199va_device = { + .name = "MSI MS-6199VA", + .internal_name = "ms6199va_device", + .flags = 0, + .local = 0, + .init = NULL, + .close = NULL, + .reset = NULL, + .available = NULL, + .speed_changed = NULL, + .force_redraw = NULL, + .config = ms6199va_config +}; + +int +machine_at_ms6199va_init(const machine_t *model) +{ + int ret = 0; + const char *fn; + + /* No ROMs available */ + if (!device_available(model->device)) + return ret; + + device_context(model->device); + fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0); + ret = bios_load_linear(fn, 0x000c0000, 262144, 0); + device_context_restore(); + + machine_at_common_init_ex(model, 2); + + pci_init(PCI_CONFIG_TYPE_1); + pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0); + pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 3, 4); + pci_register_slot(0x0C, PCI_CARD_SOUND, 3, 4, 1, 2); + pci_register_slot(0x0E, PCI_CARD_NORMAL, 1, 2, 3, 4); + pci_register_slot(0x10, PCI_CARD_NORMAL, 2, 3, 4, 1); + pci_register_slot(0x12, PCI_CARD_NORMAL, 3, 4, 1, 2); + pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 1, 4, 3); + pci_register_slot(0x14, PCI_CARD_NORMAL, 2, 1, 4, 3); + pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 3, 4); + + device_add(&via_apro133a_device); + device_add(&via_vt82c596b_device); + device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR)); + device_add(&winbond_flash_w29c020_device); + spd_register(SPD_TYPE_SDRAM, 0x7, 512); + device_add(&w83782d_device); /* fans: Chassis, Power, CPU; temperatures: System, CPU, unused */ + hwm_values.temperatures[2] = 0; /* unused */ + + if (sound_card_current[0] == SOUND_INTERNAL) { + device_add(machine_get_snd_device(machine)); + device_add(&w83971d_device); + } + + return ret; +} + /* VIA Apollo Pro 133A */ int machine_at_p3v4x_init(const machine_t *model) diff --git a/src/machine/m_at_socket370.c b/src/machine/m_at_socket370.c index 2beca3eac..dafca0104 100644 --- a/src/machine/m_at_socket370.c +++ b/src/machine/m_at_socket370.c @@ -611,10 +611,10 @@ machine_at_ms6318_init(const machine_t *model) hwm_values.temperatures[1] += 2; /* System offset */ hwm_values.temperatures[2] = 0; /* unused */ - if (sound_card_current[0] == SOUND_INTERNAL) + if (sound_card_current[0] == SOUND_INTERNAL) { device_add(machine_get_snd_device(machine)); - - device_add(&stac9708_device); + device_add(&stac9708_device); + } return ret; } diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 4c782f0aa..e0c3bd3b0 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -18853,6 +18853,8 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, + + /* VIA Apollo Pro 133 */ /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC firmware. */ { @@ -18898,6 +18900,53 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, + /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC + firmware. */ + { + .name = "[VIA Apollo Pro 133] MSI MS-6199VA", + .internal_name = "ms6199va", + .type = MACHINE_TYPE_SLOT1, + .chipset = MACHINE_CHIPSET_VIA_APOLLO_PRO_133, + .init = machine_at_ms6199va_init, + .p1_handler = machine_generic_p1_handler, + .gpio_handler = NULL, + .available_flag = MACHINE_AVAILABLE, + .gpio_acpi_handler = NULL, + .cpu = { + .package = CPU_PKG_SLOT1, + .block = CPU_BLOCK_NONE, + .min_bus = 66666667, + .max_bus = 150000000, + .min_voltage = 1300, + .max_voltage = 3500, + .min_multi = 1.5, + .max_multi = 8.0 + }, + .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB, + .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, + .ram = { + .min = 8192, + .max = 1572864, + .step = 8192 + }, + .nvrmask = 255, + .jumpered_ecp_dma = 0, + .default_jumpered_ecp_dma = -1, + .kbc_device = NULL, + .kbc_params = 0x00000000, + .kbc_p1 = 0x00000cf0, + .gpio = 0xffffffff, + .gpio_acpi = 0xffffffff, + .device = &ms6199va_device, + .kbd_device = NULL, + .fdc_device = NULL, + .sio_device = NULL, + .vid_device = NULL, + .snd_device = &es1373_onboard_device, + .net_device = NULL + }, + + /* VIA Apollo Pro 133A */ /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC firmware. */ {