From 6831779079cded4819d08d22646a890fcf8a8691 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Thu, 3 Dec 2020 14:41:56 -0300 Subject: [PATCH] Fix socket 370 machines accidentally shipped with test configurations --- src/machine/m_at_socket370.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/machine/m_at_socket370.c b/src/machine/m_at_socket370.c index 04453c5dd..a04b4e392 100644 --- a/src/machine/m_at_socket370.c +++ b/src/machine/m_at_socket370.c @@ -336,8 +336,8 @@ machine_at_wcf681_init(const machine_t *model) { int ret; - ret = bios_load_linear(L"roms/machines/wcf681/p3tdde.bin", - 0x00080000, 524288, 0); + ret = bios_load_linear(L"roms/machines/wcf681/681osda2.bin", + 0x000c0000, 262144, 0); if (bios_only || !ret) return ret; @@ -346,8 +346,7 @@ machine_at_wcf681_init(const machine_t *model) pci_init(PCI_CONFIG_TYPE_1); pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0); - pci_register_slot(0x10, PCI_CARD_SOUTHBRIDGE, 1, 2, 0, 0); - pci_register_slot(0x11, PCI_CARD_SOUTHBRIDGE, 1, 2, 0, 0); + pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 0, 0); pci_register_slot(0x14, PCI_CARD_NORMAL, 2, 3, 4, 1); pci_register_slot(0x13, PCI_CARD_NORMAL, 3, 4, 1, 2); pci_register_slot(0x12, PCI_CARD_NORMAL, 4, 1, 2, 3); @@ -355,12 +354,12 @@ machine_at_wcf681_init(const machine_t *model) pci_register_slot(0x10, PCI_CARD_NORMAL, 2, 3, 4, 1); pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 3, 4); device_add(&via_apro133a_device); - device_add(&via_vt82c686b_device); - device_add(&via_vt82c686_sio_device); + device_add(&via_vt82c596b_device); + device_add(&w83977tf_device); device_add(&keyboard_ps2_ami_pci_device); device_add(&sst_flash_39sf020_device); spd_register(SPD_TYPE_SDRAM, 0x3, 512); - device_add(&via_vt82c686_hwm_device); /* fans: CPU, unused, unused; temperatures: System, unused, CPU */ + device_add(&w83781d_device); /* fans: CPU, unused, unused; temperatures: System, unused, CPU */ hwm_values.voltages[1] = 2500; /* +2.5V */ hwm_values.fans[1] = 0; /* unused */ hwm_values.fans[2] = 0; /* unused */ @@ -447,7 +446,7 @@ machine_at_603tcf_init(const machine_t *model) { int ret; - ret = bios_load_linear(L"roms/machines/603tcf/6VX-4X.F8", + ret = bios_load_linear(L"roms/machines/603tcf/603tcfA4.BIN", 0x000c0000, 262144, 0); if (bios_only || !ret) @@ -463,11 +462,11 @@ machine_at_603tcf_init(const machine_t *model) pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2); pci_register_slot(0x0B, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 3, 4); - device_add(&via_apro133a_device); - device_add(&via_vt82c686a_device); + device_add(&via_vt8601_device); + device_add(&via_vt82c686b_device); device_add(&via_vt82c686_sio_device); device_add(&keyboard_ps2_ami_pci_device); - device_add(&sst_flash_29ee020_device); + device_add(&sst_flash_39sf020_device); spd_register(SPD_TYPE_SDRAM, 0x3, 512); device_add(&via_vt82c686_hwm_device); /* fans: 1, 2; temperatures: CPU, System, unused */ hwm_values.temperatures[0] += 2; /* CPU offset */