claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
F10
2020-10-16 08:58:02 +03:00
committed by GitHub
parent 246ec0c168 8d1092688a
commit bda8b9848b
4 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/machine/m_at_socket7_s7.c → src/machine/m_at_socket7.c
View File

@@ -860,13 +860,8 @@ machine_at_tx97_init(const machine_t *model)
{
int ret;
#if 0
ret = bios_load_linear(L"roms/machines/tx97/0112.001",
0x000e0000, 131072, 0);
#else
ret = bios_load_linear(L"roms/machines/tx97/0112.001",
0x000c0000, 262144, 0);
#endif
if (bios_only || !ret)
return ret;
@@ -875,7 +870,6 @@ machine_at_tx97_init(const machine_t *model)
pci_init(PCI_CONFIG_TYPE_1);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
#if 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);
@@ -883,22 +877,11 @@ machine_at_tx97_init(const machine_t *model)
pci_register_slot(0x01, 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);
#else
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(0x0D, PCI_CARD_NORMAL, 1, 0, 0, 0);
pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4); /* PIIX4 */
#endif
device_add(&i430tx_device);
// device_add(&piix4_device);
device_add(&piix4e_device);
device_add(&piix4_device);
device_add(&keyboard_ps2_ami_pci_device);
// device_add(&w83877tf_acorp_device);
device_add(&pc87307_15c_device);
// device_add(&intel_flash_bxt_device);
device_add(&sst_flash_29ee020_device);
device_add(&w83877tf_acorp_device);
device_add(&intel_flash_bxt_device);
spd_register(SPD_TYPE_SDRAM, 0x3, 128);
hwm_values_t machine_hwm = {