From 01f6f9fc2a454ecd636703d4039466a007afb429 Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 23 Mar 2020 03:21:07 +0100 Subject: [PATCH] Some machine changes - TXP4 now uses revision 0112 BIOS since it now works, and the SP586TX now uses the correct PCI slots. --- src/machine/m_at_socket7_s7.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/machine/m_at_socket7_s7.c b/src/machine/m_at_socket7_s7.c index 9db6c31cc..685dcb7a5 100644 --- a/src/machine/m_at_socket7_s7.c +++ b/src/machine/m_at_socket7_s7.c @@ -315,7 +315,7 @@ machine_at_tc430hx_init(const machine_t *model) if (bios_only || !ret) return ret; - machine_at_common_init_ex(model, 2); + machine_at_common_init(model); pci_init(PCI_CONFIG_TYPE_1); pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0); @@ -526,13 +526,8 @@ machine_at_txp4_init(const machine_t *model) { int ret; -#if 0 - ret = bios_load_linear(L"roms/machines/txp4/5itw003.bin", + ret = bios_load_linear(L"roms/machines/txp4/0112L.001", 0x000e0000, 131072, 0); -#else - ret = bios_load_linear(L"roms/machines/txp4/TX5I0108.AWD", - 0x000e0000, 131072, 0); -#endif if (bios_only || !ret) return ret; @@ -605,13 +600,11 @@ machine_at_sp586tx_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(0x0C, PCI_CARD_NORMAL, 1, 2, 3, 4); - pci_register_slot(0x0B, PCI_CARD_NORMAL, 2, 3, 4, 1); - pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2); - pci_register_slot(0x09, PCI_CARD_NORMAL, 4, 1, 2, 3); + pci_register_slot(0x09, PCI_CARD_NORMAL, 1, 2, 3, 4); + pci_register_slot(0x0A, PCI_CARD_NORMAL, 2, 3, 4, 1); + pci_register_slot(0x0B, PCI_CARD_NORMAL, 3, 4, 1, 2); + pci_register_slot(0x0C, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4); /* PIIX4 */ - pci_register_slot(0x0D, PCI_CARD_NORMAL, 1, 2, 3, 4); - pci_register_slot(0x08, PCI_CARD_NORMAL, 1, 2, 3, 4); device_add(&i430tx_device); device_add(&piix4_device); device_add(&keyboard_ps2_pci_device);