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 03/10] vt82c686b: Rename VT82C686B to VT82C686B_ISA
Date: Mon, 28 Dec 2020 03:08:13 +0100 [thread overview]
Message-ID: <ede62ad54154ca9b33badc1476ee95e016cf8e72.1609121293.git.balaton@eik.bme.hu> (raw)
In-Reply-To: <cover.1609121293.git.balaton@eik.bme.hu>
This is really the ISA bridge part so name the type accordingly.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
hw/isa/vt82c686.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 1be1169f83..d40599c7da 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -43,14 +43,14 @@ typedef struct SuperIOConfig {
uint8_t data;
} SuperIOConfig;
-struct VT82C686BState {
+struct VT82C686BISAState {
PCIDevice dev;
MemoryRegion superio;
SuperIOConfig superio_conf;
};
-#define TYPE_VT82C686B "VT82C686B"
-OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BState, VT82C686B)
+#define TYPE_VT82C686B_ISA "vt82c686b-isa"
+OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA)
static void superio_ioport_writeb(void *opaque, hwaddr addr, uint64_t data,
unsigned size)
@@ -117,7 +117,7 @@ static const MemoryRegionOps superio_ops = {
static void vt82c686b_isa_reset(DeviceState *dev)
{
- VT82C686BState *vt82c = VT82C686B(dev);
+ VT82C686BISAState *vt82c = VT82C686B_ISA(dev);
uint8_t *pci_conf = vt82c->dev.config;
pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0);
@@ -146,7 +146,7 @@ static void vt82c686b_isa_reset(DeviceState *dev)
static void vt82c686b_write_config(PCIDevice *d, uint32_t address,
uint32_t val, int len)
{
- VT82C686BState *vt686 = VT82C686B(d);
+ VT82C686BISAState *vt686 = VT82C686B_ISA(d);
DPRINTF("vt82c686b_write_config address 0x%x val 0x%x len 0x%x\n",
address, val, len);
@@ -434,7 +434,7 @@ static const VMStateDescription vmstate_via = {
.version_id = 1,
.minimum_version_id = 1,
.fields = (VMStateField[]) {
- VMSTATE_PCI_DEVICE(dev, VT82C686BState),
+ VMSTATE_PCI_DEVICE(dev, VT82C686BISAState),
VMSTATE_END_OF_LIST()
}
};
@@ -442,7 +442,7 @@ static const VMStateDescription vmstate_via = {
/* init the PCI-to-ISA bridge */
static void vt82c686b_realize(PCIDevice *d, Error **errp)
{
- VT82C686BState *vt82c = VT82C686B(d);
+ VT82C686BISAState *vt82c = VT82C686B_ISA(d);
uint8_t *pci_conf;
ISABus *isa_bus;
uint8_t *wmask;
@@ -479,7 +479,7 @@ ISABus *vt82c686b_isa_init(PCIBus *bus, int devfn)
{
PCIDevice *d;
- d = pci_create_simple_multifunction(bus, devfn, true, TYPE_VT82C686B);
+ d = pci_create_simple_multifunction(bus, devfn, true, TYPE_VT82C686B_ISA);
return ISA_BUS(qdev_get_child_bus(DEVICE(d), "isa.0"));
}
@@ -505,9 +505,9 @@ static void via_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo via_info = {
- .name = TYPE_VT82C686B,
+ .name = TYPE_VT82C686B_ISA,
.parent = TYPE_PCI_DEVICE,
- .instance_size = sizeof(VT82C686BState),
+ .instance_size = sizeof(VT82C686BISAState),
.class_init = via_class_init,
.interfaces = (InterfaceInfo[]) {
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
--
2.21.3
next 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 ` BALATON Zoltan via [this message]
2020-12-28 11:31 ` [PATCH v2 03/10] vt82c686b: Rename VT82C686B to VT82C686B_ISA 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 ` [PATCH v2 01/10] vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA BALATON Zoltan via
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=ede62ad54154ca9b33badc1476ee95e016cf8e72.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).