mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA

Browse Source 
These parts are common between VT82C686B and VT8231 so can be shared
in the future. Rename them to VIA prefix accordingly.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <510ddb17836a2c2e68a27cf2dcaee420bc2efbc1.1609584215.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 b4bb339b3d
commit 5a4856ed78
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/isa/vt82c686.c
View File

@ -168,22 +168,22 @@ struct VT686PMState {
uint32_t smb_io_base; uint32_t smb_io_base;
}; };
struct VT686AC97State { struct VIAAC97State {
PCIDevice dev; PCIDevice dev;
}; };
struct VT686MC97State { struct VIAMC97State {
PCIDevice dev; PCIDevice dev;
}; };
#define TYPE_VT82C686B_PM_DEVICE "VT82C686B_PM" #define TYPE_VT82C686B_PM_DEVICE "VT82C686B_PM"
OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM_DEVICE) OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM_DEVICE)
#define TYPE_VT82C686B_MC97_DEVICE "VT82C686B_MC97" #define TYPE_VIA_MC97_DEVICE "VIA_MC97"
OBJECT_DECLARE_SIMPLE_TYPE(VT686MC97State, VT82C686B_MC97_DEVICE) OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97_DEVICE)
#define TYPE_VT82C686B_AC97_DEVICE "VT82C686B_AC97" #define TYPE_VIA_AC97_DEVICE "VIA_AC97"
OBJECT_DECLARE_SIMPLE_TYPE(VT686AC97State, VT82C686B_AC97_DEVICE) OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97_DEVICE)
static void pm_update_sci(VT686PMState *s) static void pm_update_sci(VT686PMState *s)
{ {
@ -260,7 +260,7 @@ static const VMStateDescription vmstate_acpi = {
static void vt82c686b_ac97_realize(PCIDevice *dev, Error **errp) static void vt82c686b_ac97_realize(PCIDevice *dev, Error **errp)
{ {
VT686AC97State *s = VT82C686B_AC97_DEVICE(dev); VIAAC97State *s = VIA_AC97_DEVICE(dev);
uint8_t *pci_conf = s->dev.config; uint8_t *pci_conf = s->dev.config;
pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE | pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE |
@ -274,7 +274,7 @@ void vt82c686b_ac97_init(PCIBus *bus, int devfn)
{ {
PCIDevice *dev; PCIDevice *dev;
dev = pci_new(devfn, TYPE_VT82C686B_AC97_DEVICE); dev = pci_new(devfn, TYPE_VIA_AC97_DEVICE);
pci_realize_and_unref(dev, bus, &error_fatal); pci_realize_and_unref(dev, bus, &error_fatal);
} }
@ -293,9 +293,9 @@ static void via_ac97_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo via_ac97_info = { static const TypeInfo via_ac97_info = {
.name = TYPE_VT82C686B_AC97_DEVICE, .name = TYPE_VIA_AC97_DEVICE,
.parent = TYPE_PCI_DEVICE, .parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(VT686AC97State), .instance_size = sizeof(VIAAC97State),
.class_init = via_ac97_class_init, .class_init = via_ac97_class_init,
.interfaces = (InterfaceInfo[]) { .interfaces = (InterfaceInfo[]) {
{ INTERFACE_CONVENTIONAL_PCI_DEVICE }, { INTERFACE_CONVENTIONAL_PCI_DEVICE },
@ -305,7 +305,7 @@ static const TypeInfo via_ac97_info = {
static void vt82c686b_mc97_realize(PCIDevice *dev, Error **errp) static void vt82c686b_mc97_realize(PCIDevice *dev, Error **errp)
{ {
VT686MC97State *s = VT82C686B_MC97_DEVICE(dev); VIAMC97State *s = VIA_MC97_DEVICE(dev);
uint8_t *pci_conf = s->dev.config; uint8_t *pci_conf = s->dev.config;
pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE | pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE |
@ -318,7 +318,7 @@ void vt82c686b_mc97_init(PCIBus *bus, int devfn)
{ {
PCIDevice *dev; PCIDevice *dev;
dev = pci_new(devfn, TYPE_VT82C686B_MC97_DEVICE); dev = pci_new(devfn, TYPE_VIA_MC97_DEVICE);
pci_realize_and_unref(dev, bus, &error_fatal); pci_realize_and_unref(dev, bus, &error_fatal);
} }
@ -337,9 +337,9 @@ static void via_mc97_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo via_mc97_info = { static const TypeInfo via_mc97_info = {
.name = TYPE_VT82C686B_MC97_DEVICE, .name = TYPE_VIA_MC97_DEVICE,
.parent = TYPE_PCI_DEVICE, .parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(VT686MC97State), .instance_size = sizeof(VIAMC97State),
.class_init = via_mc97_class_init, .class_init = via_mc97_class_init,
.interfaces = (InterfaceInfo[]) { .interfaces = (InterfaceInfo[]) {
{ INTERFACE_CONVENTIONAL_PCI_DEVICE }, { INTERFACE_CONVENTIONAL_PCI_DEVICE },