Fixed the hard disk controller mess (and added a check to prevent double IDE initialization), and made IDE always initialized as a device_t.

This commit is contained in:
OBattler
2018-02-14 13:52:19 +01:00
parent 60a4127216
commit bc0511d866
16 changed files with 155 additions and 100 deletions

View File

@@ -8,7 +8,7 @@
*
* Implementation of the Intel 440FX PCISet chip.
*
* Version: @(#)m_at_440fx.c 1.0.9 2018/01/04
* Version: @(#)m_at_440fx.c 1.0.10 2018/02/14
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -197,7 +197,7 @@ static void i440fx_init(void)
void
machine_at_i440fx_init(machine_t *model)
{
machine_at_ps2_ide_init(model);
machine_at_ps2_init(model);
memregs_init();
pci_init(PCI_CONFIG_TYPE_1);
@@ -219,7 +219,7 @@ machine_at_i440fx_init(machine_t *model)
void
machine_at_s1668_init(machine_t *model)
{
machine_at_common_ide_init(model);
machine_at_common_init(model);
device_add(&keyboard_ps2_ami_device);
memregs_init();