From 482cf4af1e67a4fbc4d2c5671922ec1465e33596 Mon Sep 17 00:00:00 2001 From: OBattler Date: Thu, 16 Apr 2020 22:04:25 +0200 Subject: [PATCH] Readded the VIA FIC machine. --- src/include/86box/machine.h | 1 + src/machine/m_at_super7_ss7.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index c9bad1c7d..1e630b191 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -310,6 +310,7 @@ extern int machine_at_advanceii_init(const machine_t *); /* m_at_super7_ss7.c */ extern int machine_at_ax59pro_init(const machine_t *); +extern int machine_at_mvp3_init(const machine_t *); /* m_at_socket8.c */ extern int machine_at_686nx_init(const machine_t *); diff --git a/src/machine/m_at_super7_ss7.c b/src/machine/m_at_super7_ss7.c index 7372c7994..bc876a206 100644 --- a/src/machine/m_at_super7_ss7.c +++ b/src/machine/m_at_super7_ss7.c @@ -65,13 +65,43 @@ machine_at_ax59pro_init(const machine_t *model) pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2); pci_register_slot(0x09, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4); - pci_register_slot(0x01, PCI_CARD_NORMAL, 1, 2, 3, 4); + pci_register_slot(0x01, PCI_CARD_NORMAL, 1, 2, 3, 4); device_add(&via_mvp3_device); device_add(&via_vt82c586b_device); device_add(&keyboard_ps2_pci_device); device_add(&w83877tf_device); device_add(&sst_flash_39sf020_device); - spd_register(SPD_TYPE_SDRAM, 0xF, 256); + spd_register(SPD_TYPE_SDRAM, 0xF, 256); + + return ret; +} + + +int +machine_at_mvp3_init(const machine_t *model) +{ + int ret; + + ret = bios_load_linear(L"roms/machines/ficva503p/je4333.bin", + 0x000e0000, 131072, 0); + + if (bios_only || !ret) + return ret; + + 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(0x08, PCI_CARD_NORMAL, 1, 2, 3, 4); + pci_register_slot(0x09, PCI_CARD_NORMAL, 2, 3, 4, 1); + pci_register_slot(0x0a, PCI_CARD_NORMAL, 3, 4, 1, 2); + pci_register_slot(0x01, PCI_CARD_NORMAL, 1, 2, 3, 4); + pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4); + device_add(&via_mvp3_device); + device_add(&via_vt82c586b_device); + device_add(&keyboard_ps2_pci_device); + device_add(&w83877tf_device); + device_add(&sst_flash_39sf010_device); return ret; }