[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 01/12] gus: QOM'ify some more
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v2 01/12] gus: QOM'ify some more |
Date: |
Fri, 7 Jun 2013 14:58:09 +0200 |
Add type constant and cast macro.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/audio/gus.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/audio/gus.c b/hw/audio/gus.c
index a91921c..e0aea26 100644
--- a/hw/audio/gus.c
+++ b/hw/audio/gus.c
@@ -46,6 +46,9 @@
#define IO_WRITE_PROTO(name) \
static void name (void *opaque, uint32_t nport, uint32_t val)
+#define TYPE_GUS "gus"
+#define GUS(obj) OBJECT_CHECK (GUSState, (obj), TYPE_GUS)
+
typedef struct GUSState {
ISADevice dev;
GUSEmuState emu;
@@ -250,7 +253,7 @@ static const MemoryRegionPortio gus_portio_list2[] = {
static int gus_initfn (ISADevice *dev)
{
- GUSState *s = DO_UPCAST (GUSState, dev, dev);
+ GUSState *s = GUS (dev);
struct audsettings as;
AUD_register_card ("gus", &s->card);
@@ -295,7 +298,7 @@ static int gus_initfn (ISADevice *dev)
static int GUS_init (ISABus *bus)
{
- isa_create_simple (bus, "gus");
+ isa_create_simple (bus, TYPE_GUS);
return 0;
}
@@ -318,7 +321,7 @@ static void gus_class_initfn (ObjectClass *klass, void
*data)
}
static const TypeInfo gus_info = {
- .name = "gus",
+ .name = TYPE_GUS,
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof (GUSState),
.class_init = gus_class_initfn,
--
1.8.1.4
- [Qemu-devel] [PATCH v2 00/12] QOM realize for ISA, part 2, Andreas Färber, 2013/06/07
- [Qemu-devel] [PATCH v2 04/12] i8254: QOM'ify some more, Andreas Färber, 2013/06/07
- [Qemu-devel] [PATCH v2 01/12] gus: QOM'ify some more,
Andreas Färber <=
- [Qemu-devel] [PATCH v2 09/12] i8259: Convert PICCommonState to use QOM realizefn, Andreas Färber, 2013/06/07
- [Qemu-devel] [PATCH v2 10/12] isa: QOM'ify ISABus, Andreas Färber, 2013/06/07
- [Qemu-devel] [PATCH v2 12/12] qdev: Drop FROM_QBUS() macro, Andreas Färber, 2013/06/07
- [Qemu-devel] [PATCH v2 11/12] isa: QOM'ify ISADevice, Andreas Färber, 2013/06/07
- [Qemu-devel] [PATCH v2 08/12] kvm/i8259: QOM'ify some more, Andreas Färber, 2013/06/07
- [Qemu-devel] [PATCH v2 02/12] cs4231a: QOM'ify some more, Andreas Färber, 2013/06/07
- [Qemu-devel] [PATCH v2 07/12] i8259: QOM'ify some more, Andreas Färber, 2013/06/07
- [Qemu-devel] [PATCH v2 05/12] kvm/i8254: QOM'ify some more, Andreas Färber, 2013/06/07