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

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source 
# Conflicts:
#	src/machine/m_at_socket8.c
This commit is contained in:
RichardG867
2020-03-25 21:37:38 -03:00
parent d1be6a014f f59bf9ce27
commit d3ecbd800f
358 changed files with 4210 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/machine/m_at_socket8.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of Socket 8 and Slot 1 machines.
*
* Version: @(#)m_at_socket8.c 1.0.0 2019/05/16
*
*
* Authors: Miran Grca, <mgrca8@gmail.com>
*
@@ -200,6 +200,40 @@ machine_at_p2bls_init(const machine_t *model)
return ret;
}
int
machine_at_borapro_init(const machine_t *model)
{
//AMI 440ZX Board. Packard Bell OEM of the MSI-6168
//MIGHT REQUIRE MORE EXCESSIVE TESTING!
//Reports emmersive amounts of RAM like few Intel OEM boards
//we have.
int ret;
ret = bios_load_linear(L"roms/machines/borapro/MS6168V2.50",
0x000c0000, 262144, 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(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(0x14, PCI_CARD_NORMAL, 4, 1, 2, 3);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
pci_register_slot(0x01, PCI_CARD_NORMAL, 1, 2, 3, 4);
device_add(&i440zx_device);
device_add(&piix4e_device);
device_add(&w83977ef_device);
device_add(&keyboard_ps2_ami_pci_device);
device_add(&intel_flash_bxt_device);
return ret;
}
int
machine_at_p6bxt_init(const machine_t *model)
@@ -227,7 +261,7 @@ machine_at_p6bxt_init(const machine_t *model)
device_add(&piix4e_device);
device_add(&w83977tf_device);
device_add(&keyboard_ps2_pci_device);
device_add(&intel_flash_bxt_device);
device_add(&sst_flash_39sf020_device);
spd_register(SPD_TYPE_SDRAM, 0x7, 256);
return ret;