aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBALATON Zoltan <balaton@eik.bme.hu>2021-01-02 11:43:35 +0100
committerPhilippe Mathieu-Daudé <f4bug@amsat.org>2021-01-04 23:24:44 +0100
commit5a4856ed78e8b83f6eece2efbbedccba857aaff7 (patch)
tree9b26c8b3bd83e028cc12217bf8de7e82762caad0
parentb4bb339b3ddb24601b5f914fb0bc7275a69d2c94 (diff)
downloadqemu-5a4856ed78e8b83f6eece2efbbedccba857aaff7.zip
qemu-5a4856ed78e8b83f6eece2efbbedccba857aaff7.tar.gz
qemu-5a4856ed78e8b83f6eece2efbbedccba857aaff7.tar.bz2
vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA
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>
-rw-r--r--hw/isa/vt82c686.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index b3170c7..2a0f85d 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -168,22 +168,22 @@ struct VT686PMState {
uint32_t smb_io_base;
};
-struct VT686AC97State {
+struct VIAAC97State {
PCIDevice dev;
};
-struct VT686MC97State {
+struct VIAMC97State {
PCIDevice dev;
};
#define TYPE_VT82C686B_PM_DEVICE "VT82C686B_PM"
OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM_DEVICE)
-#define TYPE_VT82C686B_MC97_DEVICE "VT82C686B_MC97"
-OBJECT_DECLARE_SIMPLE_TYPE(VT686MC97State, VT82C686B_MC97_DEVICE)
+#define TYPE_VIA_MC97_DEVICE "VIA_MC97"
+OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97_DEVICE)
-#define TYPE_VT82C686B_AC97_DEVICE "VT82C686B_AC97"
-OBJECT_DECLARE_SIMPLE_TYPE(VT686AC97State, VT82C686B_AC97_DEVICE)
+#define TYPE_VIA_AC97_DEVICE "VIA_AC97"
+OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97_DEVICE)
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)
{
- VT686AC97State *s = VT82C686B_AC97_DEVICE(dev);
+ VIAAC97State *s = VIA_AC97_DEVICE(dev);
uint8_t *pci_conf = s->dev.config;
pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE |
@@ -274,7 +274,7 @@ void vt82c686b_ac97_init(PCIBus *bus, int devfn)
{
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);
}
@@ -293,9 +293,9 @@ static void via_ac97_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo via_ac97_info = {
- .name = TYPE_VT82C686B_AC97_DEVICE,
+ .name = TYPE_VIA_AC97_DEVICE,
.parent = TYPE_PCI_DEVICE,
- .instance_size = sizeof(VT686AC97State),
+ .instance_size = sizeof(VIAAC97State),
.class_init = via_ac97_class_init,
.interfaces = (InterfaceInfo[]) {
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
@@ -305,7 +305,7 @@ static const TypeInfo via_ac97_info = {
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;
pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE |
@@ -318,7 +318,7 @@ void vt82c686b_mc97_init(PCIBus *bus, int devfn)
{
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);
}
@@ -337,9 +337,9 @@ static void via_mc97_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo via_mc97_info = {
- .name = TYPE_VT82C686B_MC97_DEVICE,
+ .name = TYPE_VIA_MC97_DEVICE,
.parent = TYPE_PCI_DEVICE,
- .instance_size = sizeof(VT686MC97State),
+ .instance_size = sizeof(VIAMC97State),
.class_init = via_mc97_class_init,
.interfaces = (InterfaceInfo[]) {
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },