OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vt82c686: Remove legacy vt82c686b_isa_init() function

Browse Source 
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <58d7585f979f154b1f1e69fdc026eed6dbc7996f.1609584216.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
BALATON Zoltan 2021-01-02 11:43:35 +01:00 committed by Philippe Mathieu-Daudé
parent a250e1c6e7
commit 0bfda9a225
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/isa/vt82c686.c
View File

@ -49,7 +49,6 @@ struct VT82C686BISAState {
SuperIOConfig superio_conf; SuperIOConfig superio_conf;
}; };
#define TYPE_VT82C686B_ISA "vt82c686b-isa"
OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA) OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA)
static void superio_ioport_writeb(void *opaque, hwaddr addr, uint64_t data, static void superio_ioport_writeb(void *opaque, hwaddr addr, uint64_t data,
@ -367,14 +366,6 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp)
&vt82c->superio); &vt82c->superio);
} }
ISABus *vt82c686b_isa_init(PCIBus *bus, int devfn)
{
PCIDevice *d;
d = pci_create_simple_multifunction(bus, devfn, true, TYPE_VT82C686B_ISA);
return ISA_BUS(qdev_get_child_bus(DEVICE(d), "isa.0"));
}
static void via_class_init(ObjectClass *klass, void *data) static void via_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);

4
hw/mips/fuloong2e.c
View File

@ -240,7 +240,9 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc,
ISABus *isa_bus; ISABus *isa_bus;
PCIDevice *dev; PCIDevice *dev;
isa_bus = vt82c686b_isa_init(pci_bus, PCI_DEVFN(slot, 0)); dev = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(slot, 0), true,
TYPE_VT82C686B_ISA);
isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(dev), "isa.0"));
assert(isa_bus); assert(isa_bus);
*p_isa_bus = isa_bus; *p_isa_bus = isa_bus;
/* Interrupt controller */ /* Interrupt controller */

3
include/hw/isa/vt82c686.h
View File

@ -1,13 +1,12 @@
#ifndef HW_VT82C686_H #ifndef HW_VT82C686_H
#define HW_VT82C686_H #define HW_VT82C686_H
#define TYPE_VT82C686B_ISA "vt82c686b-isa"
#define TYPE_VT82C686B_SUPERIO "vt82c686b-superio" #define TYPE_VT82C686B_SUPERIO "vt82c686b-superio"
#define TYPE_VIA_AC97 "via-ac97" #define TYPE_VIA_AC97 "via-ac97"
#define TYPE_VIA_MC97 "via-mc97" #define TYPE_VIA_MC97 "via-mc97"
/* vt82c686.c */ /* vt82c686.c */
ISABus *vt82c686b_isa_init(PCIBus * bus, int devfn);
I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
qemu_irq sci_irq); qemu_irq sci_irq);