From: BALATON Zoltan via <qemu-devel@nongnu.org>
To: qemu-devel@nongnu.org
Cc: Huacai Chen <chenhuacai@kernel.org>, f4bug@amsat.org
Subject: [PATCH v2 01/10] vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA
Date: Mon, 28 Dec 2020 03:08:13 +0100 [thread overview]
Message-ID: <43d949fea01d0ceacc677c9d68b8e64bb637cc21.1609121293.git.balaton@eik.bme.hu> (raw)
In-Reply-To: <cover.1609121293.git.balaton@eik.bme.hu>
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>
---
hw/isa/vt82c686.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index b3170c70c3..2a0f85dea9 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 },
--
2.21.3
prev parent reply other threads:[~2020-12-28 2:27 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 2:08 [PATCH v2 00/10] Misc vt82c686b clean ups BALATON Zoltan via
2020-12-28 2:08 ` [PATCH v2 03/10] vt82c686b: Rename VT82C686B to VT82C686B_ISA BALATON Zoltan via
2020-12-28 11:31 ` Philippe Mathieu-Daudé
2020-12-28 2:08 ` [PATCH v2 09/10] vt82c686: Convert debug printf to trace points BALATON Zoltan via
2021-01-01 21:32 ` Philippe Mathieu-Daudé
2021-01-01 23:03 ` BALATON Zoltan via
2021-01-01 23:11 ` BALATON Zoltan via
2020-12-28 2:08 ` [PATCH v2 05/10] vt82c686: Split off via-[am]c97 into separate file in hw/audio BALATON Zoltan via
2020-12-28 2:08 ` [PATCH v2 02/10] vt82c686: Remove unnecessary _DEVICE suffix from type macros BALATON Zoltan via
2020-12-28 2:08 ` [PATCH v2 06/10] audio/via-ac97: Simplify code and set user_creatable to false BALATON Zoltan via
2021-01-01 21:19 ` Philippe Mathieu-Daudé
2020-12-28 2:08 ` [PATCH v2 10/10] vt82c686: Remove unneeded includes and defines BALATON Zoltan via
2020-12-28 11:31 ` Philippe Mathieu-Daudé
2020-12-28 2:08 ` [PATCH v2 08/10] vt82c686: Remove legacy vt82c686b_pm_init() function BALATON Zoltan via
2020-12-28 2:08 ` [PATCH v2 07/10] vt82c686: Remove legacy vt82c686b_isa_init() function BALATON Zoltan via
2020-12-28 2:08 ` [PATCH v2 04/10] vt82c686: Remove vt82c686b_[am]c97_init() functions BALATON Zoltan via
2021-01-01 21:16 ` Philippe Mathieu-Daudé
2020-12-28 2:08 ` BALATON Zoltan via [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43d949fea01d0ceacc677c9d68b8e64bb637cc21.1609121293.git.balaton@eik.bme.hu \
--to=qemu-devel@nongnu.org \
--cc=balaton@eik.bme.hu \
--cc=chenhuacai@kernel.org \
--cc=f4bug@amsat.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).