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

Merge pull request #1539 from 86Box/master

Browse Source 
Bring the branch up to part with master.
This commit is contained in:
Miran Grča
2021-07-09 04:42:04 +02:00
committed by GitHub
parent 638dff832f ce1799c630
commit aa06cffe24
13 changed files with 482 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/machine/m_at_slot1.c
View File

@@ -509,7 +509,7 @@ machine_at_ficka6130_init(const machine_t *model)
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_apro_device);
device_add(&via_vt82c596_device);
device_add(&via_vt82c596a_device);
device_add(&w83877tf_device);
device_add(&keyboard_ps2_ami_pci_device);
device_add(&sst_flash_29ee020_device);