vt82c686: Remove vt82c686b_[am]c97_init() functions
These are legacy init functions that are just equivalent to directly calling pci_create_simple so do that instead. Also rename objects to lower case via-ac97 and via-mc97 matching naming of other devices. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <1c4373c8aeb6c4fb2a8df2c864b0e91a977a3d7b.1609584216.git.balaton@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
parent
0f79846147
commit
07c6832cb2
|
@ -179,12 +179,6 @@ struct VIAMC97State {
|
||||||
#define TYPE_VT82C686B_PM "VT82C686B_PM"
|
#define TYPE_VT82C686B_PM "VT82C686B_PM"
|
||||||
OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM)
|
OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM)
|
||||||
|
|
||||||
#define TYPE_VIA_MC97 "VIA_MC97"
|
|
||||||
OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97)
|
|
||||||
|
|
||||||
#define TYPE_VIA_AC97 "VIA_AC97"
|
|
||||||
OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97)
|
|
||||||
|
|
||||||
static void pm_update_sci(VT686PMState *s)
|
static void pm_update_sci(VT686PMState *s)
|
||||||
{
|
{
|
||||||
int sci_level, pmsts;
|
int sci_level, pmsts;
|
||||||
|
@ -254,10 +248,13 @@ static const VMStateDescription vmstate_acpi = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* TODO: vt82c686b_ac97_init() and vt82c686b_mc97_init()
|
* TODO: VIA_AC97 and VIA_MC97
|
||||||
* just register a PCI device now, functionalities will be implemented later.
|
* just register a PCI device now, functionalities will be implemented later.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97)
|
||||||
|
OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97)
|
||||||
|
|
||||||
static void vt82c686b_ac97_realize(PCIDevice *dev, Error **errp)
|
static void vt82c686b_ac97_realize(PCIDevice *dev, Error **errp)
|
||||||
{
|
{
|
||||||
VIAAC97State *s = VIA_AC97(dev);
|
VIAAC97State *s = VIA_AC97(dev);
|
||||||
|
@ -270,14 +267,6 @@ static void vt82c686b_ac97_realize(PCIDevice *dev, Error **errp)
|
||||||
pci_set_long(pci_conf + PCI_INTERRUPT_PIN, 0x03);
|
pci_set_long(pci_conf + PCI_INTERRUPT_PIN, 0x03);
|
||||||
}
|
}
|
||||||
|
|
||||||
void vt82c686b_ac97_init(PCIBus *bus, int devfn)
|
|
||||||
{
|
|
||||||
PCIDevice *dev;
|
|
||||||
|
|
||||||
dev = pci_new(devfn, TYPE_VIA_AC97);
|
|
||||||
pci_realize_and_unref(dev, bus, &error_fatal);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void via_ac97_class_init(ObjectClass *klass, void *data)
|
static void via_ac97_class_init(ObjectClass *klass, void *data)
|
||||||
{
|
{
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
@ -314,14 +303,6 @@ static void vt82c686b_mc97_realize(PCIDevice *dev, Error **errp)
|
||||||
pci_set_long(pci_conf + PCI_INTERRUPT_PIN, 0x03);
|
pci_set_long(pci_conf + PCI_INTERRUPT_PIN, 0x03);
|
||||||
}
|
}
|
||||||
|
|
||||||
void vt82c686b_mc97_init(PCIBus *bus, int devfn)
|
|
||||||
{
|
|
||||||
PCIDevice *dev;
|
|
||||||
|
|
||||||
dev = pci_new(devfn, TYPE_VIA_MC97);
|
|
||||||
pci_realize_and_unref(dev, bus, &error_fatal);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void via_mc97_class_init(ObjectClass *klass, void *data)
|
static void via_mc97_class_init(ObjectClass *klass, void *data)
|
||||||
{
|
{
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
|
|
@ -262,8 +262,8 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc,
|
||||||
*i2c_bus = vt82c686b_pm_init(pci_bus, PCI_DEVFN(slot, 4), 0xeee1, NULL);
|
*i2c_bus = vt82c686b_pm_init(pci_bus, PCI_DEVFN(slot, 4), 0xeee1, NULL);
|
||||||
|
|
||||||
/* Audio support */
|
/* Audio support */
|
||||||
vt82c686b_ac97_init(pci_bus, PCI_DEVFN(slot, 5));
|
pci_create_simple(pci_bus, PCI_DEVFN(slot, 5), TYPE_VIA_AC97);
|
||||||
vt82c686b_mc97_init(pci_bus, PCI_DEVFN(slot, 6));
|
pci_create_simple(pci_bus, PCI_DEVFN(slot, 6), TYPE_VIA_MC97);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Network support */
|
/* Network support */
|
||||||
|
|
|
@ -3,11 +3,11 @@
|
||||||
|
|
||||||
|
|
||||||
#define TYPE_VT82C686B_SUPERIO "vt82c686b-superio"
|
#define TYPE_VT82C686B_SUPERIO "vt82c686b-superio"
|
||||||
|
#define TYPE_VIA_AC97 "via-ac97"
|
||||||
|
#define TYPE_VIA_MC97 "via-mc97"
|
||||||
|
|
||||||
/* vt82c686.c */
|
/* vt82c686.c */
|
||||||
ISABus *vt82c686b_isa_init(PCIBus * bus, int devfn);
|
ISABus *vt82c686b_isa_init(PCIBus * bus, int devfn);
|
||||||
void vt82c686b_ac97_init(PCIBus *bus, int devfn);
|
|
||||||
void vt82c686b_mc97_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);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue