diff options
| author | Bernhard Beschow <shentey@gmail.com> | 2022-09-01 13:41:25 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2022-10-31 11:32:07 +0100 |
| commit | 4ff5328bf7d503805cc1baba9e4de47216f407d0 (patch) | |
| tree | 20ebc44eda1fb672a7839e4de9377a51a8d96ac5 /hw/mips | |
| parent | 0a8d405d69394f84a28cde79949612ec36d3fcda (diff) | |
| download | qemu-4ff5328bf7d503805cc1baba9e4de47216f407d0.zip qemu-4ff5328bf7d503805cc1baba9e4de47216f407d0.tar.gz qemu-4ff5328bf7d503805cc1baba9e4de47216f407d0.tar.bz2 | |
hw/mips/fuloong2e: Inline vt82c686b_southbridge_init() and remove it
The previous patches moved most of this function into the via-isa device
model such that it has become fairly trivial. So inline it for
simplicity.
Suggested-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220901114127.53914-12-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'hw/mips')
| -rw-r--r-- | hw/mips/fuloong2e.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 2d8723a..3c46215 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -196,22 +196,6 @@ static void main_cpu_reset(void *opaque) } } -static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, - I2CBus **i2c_bus) -{ - PCIDevice *dev, *via; - - via = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(slot, 0), true, - TYPE_VT82C686B_ISA); - qdev_connect_gpio_out(DEVICE(via), 0, intc); - - dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide")); - pci_ide_create_devs(dev); - - dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "pm")); - *i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c")); -} - /* Network support */ static void network_init(PCIBus *pci_bus) { @@ -308,8 +292,16 @@ static void mips_fuloong2e_init(MachineState *machine) pci_bus = bonito_init((qemu_irq *)&(env->irq[2])); /* South bridge -> IP5 */ - vt82c686b_southbridge_init(pci_bus, FULOONG2E_VIA_SLOT, env->irq[5], - &smbus); + pci_dev = pci_create_simple_multifunction(pci_bus, + PCI_DEVFN(FULOONG2E_VIA_SLOT, 0), + true, TYPE_VT82C686B_ISA); + qdev_connect_gpio_out(DEVICE(pci_dev), 0, env->irq[5]); + + dev = DEVICE(object_resolve_path_component(OBJECT(pci_dev), "ide")); + pci_ide_create_devs(PCI_DEVICE(dev)); + + dev = DEVICE(object_resolve_path_component(OBJECT(pci_dev), "pm")); + smbus = I2C_BUS(qdev_get_child_bus(dev, "i2c")); /* GPU */ if (vga_interface_type != VGA_NONE) { |