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

Merge pull request #1598 from 86Box/master

Browse Source 
Bring the branch up to par with master.
This commit is contained in:
Miran Grča
2021-08-10 15:49:15 +02:00
committed by GitHub
parent 5c8d06ab35 03d91af98c
commit 9d648644f8
6 changed files with 108 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/machine/m_at_386dx_486.c
View File

@@ -102,7 +102,7 @@ machine_at_sis401_common_init(const machine_t *model)
device_add(&keyboard_at_ami_device);
if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device);
device_add(&fdc_at_device);
}
@@ -232,7 +232,7 @@ machine_at_spc6000a_init(const machine_t *model)
device_add(&cs8230_device);
if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device);
device_add(&fdc_at_device);
device_add(&keyboard_at_ami_device);
@@ -1457,7 +1457,7 @@ machine_at_arb1479_init(const machine_t *model)
device_add(&w83977f_device);
device_add(&keyboard_ps2_ami_pci_device);
device_add(&stpc_consumer2_device);
device_add(&sst_flash_29ee020_device);
device_add(&sst_flash_39sf020_device);
return ret;
}