Fix FDC's on MCA IBM PS/2 machines fixes #4962.
This commit is contained in:
@@ -323,6 +323,8 @@ ps1_setup(int model)
|
||||
|
||||
device_add(&ps_nvr_device);
|
||||
|
||||
device_add(&fdc_ps2_device);
|
||||
|
||||
if (model == 2011) {
|
||||
if (!strcmp("english_us", device_get_config_bios("bios_language"))) {
|
||||
/* US English */
|
||||
@@ -350,8 +352,6 @@ ps1_setup(int model)
|
||||
|
||||
device_add(&ps1snd_device);
|
||||
|
||||
device_add(&fdc_at_ps1_device);
|
||||
|
||||
/* Enable the builtin HDC. */
|
||||
if (hdc_current[0] == HDC_INTERNAL) {
|
||||
priv = device_add(&ps1_hdc_device);
|
||||
@@ -378,8 +378,6 @@ ps1_setup(int model)
|
||||
if (gfxcard[0] == VID_INTERNAL)
|
||||
device_add(&ibm_ps1_2121_device);
|
||||
|
||||
device_add(&fdc_at_ps1_2121_device);
|
||||
|
||||
device_add(&ide_isa_device);
|
||||
|
||||
device_add(&ps1snd_device);
|
||||
|
||||
@@ -176,7 +176,7 @@ ps2_isa_setup(int model, int cpu_type)
|
||||
|
||||
device_add(&ps_nvr_device);
|
||||
|
||||
device_add(&fdc_at_ps1_device);
|
||||
device_add(&fdc_ps2_device);
|
||||
|
||||
/* Enable the builtin HDC. */
|
||||
if (hdc_current[0] == HDC_INTERNAL) {
|
||||
|
||||
@@ -1396,7 +1396,7 @@ machine_ps2_common_init(const machine_t *model)
|
||||
machine_common_init(model);
|
||||
|
||||
if (fdc_current[0] == FDC_INTERNAL)
|
||||
device_add(&fdc_at_device);
|
||||
device_add(&fdc_ps2_mca_device);
|
||||
|
||||
dma16_init();
|
||||
ps2_dma_init();
|
||||
|
||||
Reference in New Issue
Block a user