[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 21/34] sb16: QOM'ify
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [RFC 21/34] sb16: QOM'ify |
Date: |
Mon, 26 Nov 2012 01:12:33 +0100 |
Introduce type constant and cast macro to obsolete DO_UPCAST().
Prepares for ISA realizefn.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/sb16.c | 16 +++++++++-------
1 Datei geändert, 9 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-)
diff --git a/hw/sb16.c b/hw/sb16.c
index 523ab0d..b7e93a4 100644
--- a/hw/sb16.c
+++ b/hw/sb16.c
@@ -47,8 +47,12 @@
static const char e3[] = "COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1992.";
+#define TYPE_SB16 "sb16"
+#define SB16(obj) OBJECT_CHECK (SB16State, (obj), TYPE_SB16)
+
typedef struct SB16State {
- ISADevice dev;
+ ISADevice parent_obj;
+
QEMUSoundCard card;
qemu_irq pic;
uint32_t irq;
@@ -1354,9 +1358,7 @@ static const MemoryRegionPortio sb16_ioport_list[] = {
static int sb16_initfn (ISADevice *dev)
{
- SB16State *s;
-
- s = DO_UPCAST (SB16State, dev, dev);
+ SB16State *s = SB16 (dev);
s->cmd = -1;
isa_init_irq (dev, &s->pic, s->irq);
@@ -1386,7 +1388,7 @@ static int sb16_initfn (ISADevice *dev)
int SB16_init (ISABus *bus)
{
- isa_create_simple (bus, "sb16");
+ isa_create_simple (bus, TYPE_SB16);
return 0;
}
@@ -1409,8 +1411,8 @@ static void sb16_class_initfn (ObjectClass *klass, void
*data)
dc->props = sb16_properties;
}
-static TypeInfo sb16_info = {
- .name = "sb16",
+static const TypeInfo sb16_info = {
+ .name = TYPE_SB16,
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof (SB16State),
.class_init = sb16_class_initfn,
--
1.7.10.4
- [Qemu-devel] [RFC 00/34] QOM realize, device-only plus ISA conversion, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 05/34] isa: Split off instance_init for ISADevice, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 15/34] mc146818rtc: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 12/34] i8259: QOM cleanups, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 06/34] applesmc: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 07/34] cirrus_vga: QOM'ify ISA Cirrus VGA, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 18/34] pc: QOM'ify port 92, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 23/34] sga: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 17/34] parallel: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 21/34] sb16: QOM'ify,
Andreas Färber <=
- [Qemu-devel] [RFC 22/34] serial: QOM'ify ISA serial, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 10/34] i82374: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 08/34] debugcon: QOM'ify ISA debug console, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 14/34] m48t59: QOM'ify ISA M48T59 NVRAM, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 02/34] qbus: QOM'ify qbus_realize(), Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 29/34] i8254: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 09/34] fdc: QOM'ify ISA floppy controller, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 13/34] ide: QOM'ify ISA IDE, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 24/34] vga-isa: QOM'ify ISA VGA, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 32/34] i8259: QOM'ify some more, Andreas Färber, 2012/11/25