hw/isa/piix4: Inline and remove piix4_create()
During the previous changesets piix4_create() became a trivial wrapper around more generic functions. Modernize the code. Signed-off-by: Bernhard Beschow <shentey@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Message-Id: <20220603185045.143789-8-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
parent
19e375db22
commit
e8ebf54936
|
@ -323,16 +323,3 @@ static void piix4_register_types(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
type_init(piix4_register_types)
|
type_init(piix4_register_types)
|
||||||
|
|
||||||
DeviceState *piix4_create(PCIBus *pci_bus)
|
|
||||||
{
|
|
||||||
PCIDevice *pci;
|
|
||||||
DeviceState *dev;
|
|
||||||
int devfn = PCI_DEVFN(10, 0);
|
|
||||||
|
|
||||||
pci = pci_create_simple_multifunction(pci_bus, devfn, true,
|
|
||||||
TYPE_PIIX4_PCI_DEVICE);
|
|
||||||
dev = DEVICE(pci);
|
|
||||||
|
|
||||||
return dev;
|
|
||||||
}
|
|
||||||
|
|
|
@ -1237,6 +1237,7 @@ void mips_malta_init(MachineState *machine)
|
||||||
int fl_idx = 0;
|
int fl_idx = 0;
|
||||||
int be;
|
int be;
|
||||||
MaltaState *s;
|
MaltaState *s;
|
||||||
|
PCIDevice *piix4;
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
DeviceState *pm_dev;
|
DeviceState *pm_dev;
|
||||||
|
|
||||||
|
@ -1400,7 +1401,9 @@ void mips_malta_init(MachineState *machine)
|
||||||
empty_slot_init("GT64120", 0, 0x20000000);
|
empty_slot_init("GT64120", 0, 0x20000000);
|
||||||
|
|
||||||
/* Southbridge */
|
/* Southbridge */
|
||||||
dev = piix4_create(pci_bus);
|
piix4 = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), true,
|
||||||
|
TYPE_PIIX4_PCI_DEVICE);
|
||||||
|
dev = DEVICE(piix4);
|
||||||
isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
|
isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
|
||||||
pm_dev = DEVICE(object_resolve_path_component(OBJECT(dev), "pm"));
|
pm_dev = DEVICE(object_resolve_path_component(OBJECT(dev), "pm"));
|
||||||
smbus = I2C_BUS(qdev_get_child_bus(pm_dev, "i2c"));
|
smbus = I2C_BUS(qdev_get_child_bus(pm_dev, "i2c"));
|
||||||
|
|
|
@ -70,6 +70,4 @@ DECLARE_INSTANCE_CHECKER(PIIX3State, PIIX3_PCI_DEVICE,
|
||||||
|
|
||||||
PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus);
|
PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus);
|
||||||
|
|
||||||
DeviceState *piix4_create(PCIBus *pci_bus);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue