OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

sb16: QOM'ify

Browse Source 
Introduce type constant and cast macro to obsolete DO_UPCAST().

Prepares for ISA realizefn.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Message-id: 1367093935-29091-15-git-send-email-afaerber@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Andreas Färber 2013-04-27 22:18:49 +02:00 committed by Anthony Liguori
parent d367ece5e5
commit 399f05a6e1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/audio/sb16.c
View File

@ -47,8 +47,12 @@
static const char e3[] = "COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1992."; 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 { typedef struct SB16State {
ISADevice dev; ISADevice parent_obj;
QEMUSoundCard card; QEMUSoundCard card;
qemu_irq pic; qemu_irq pic;
uint32_t irq; uint32_t irq;
@ -1354,9 +1358,7 @@ static const MemoryRegionPortio sb16_ioport_list[] = {
static int sb16_initfn (ISADevice *dev) static int sb16_initfn (ISADevice *dev)
{ {
SB16State *s; SB16State *s = SB16 (dev);
s = DO_UPCAST (SB16State, dev, dev);
s->cmd = -1; s->cmd = -1;
isa_init_irq (dev, &s->pic, s->irq); isa_init_irq (dev, &s->pic, s->irq);
@ -1386,7 +1388,7 @@ static int sb16_initfn (ISADevice *dev)
int SB16_init (ISABus *bus) int SB16_init (ISABus *bus)
{ {
isa_create_simple (bus, "sb16"); isa_create_simple (bus, TYPE_SB16);
return 0; return 0;
} }
@ -1410,7 +1412,7 @@ static void sb16_class_initfn (ObjectClass *klass, void *data)
} }
static const TypeInfo sb16_info = { static const TypeInfo sb16_info = {
.name = "sb16", .name = TYPE_SB16,
.parent = TYPE_ISA_DEVICE, .parent = TYPE_ISA_DEVICE,
.instance_size = sizeof (SB16State), .instance_size = sizeof (SB16State),
.class_init = sb16_class_initfn, .class_init = sb16_class_initfn,