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

cs4231a: QOM'ify some more 

Introduce type constant and cast macro.
Replace reset hook with DeviceClass::reset callback.

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-06-06 16:40:02 +02:00
parent 11c7549d83
commit a3dcca567a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/audio/cs4231a.c
View File

@ -56,6 +56,9 @@ static struct {
#define CS_REGS 16 #define CS_REGS 16
#define CS_DREGS 32 #define CS_DREGS 32
#define TYPE_CS4231A "cs4231a"
#define CS4231A(obj) OBJECT_CHECK (CSState, (obj), TYPE_CS4231A)
typedef struct CSState { typedef struct CSState {
ISADevice dev; ISADevice dev;
QEMUSoundCard card; QEMUSoundCard card;
@ -208,9 +211,9 @@ static int16_t ALawDecompressTable[256] =
944, 912, 1008, 976, 816, 784, 880, 848 944, 912, 1008, 976, 816, 784, 880, 848
}; };
static void cs_reset (void *opaque) static void cs4231a_reset (DeviceState *dev)
{ {
CSState *s = opaque; CSState *s = CS4231A (dev);
s->regs[Index_Address] = 0x40; s->regs[Index_Address] = 0x40;
s->regs[Index_Data] = 0x00; s->regs[Index_Data] = 0x00;
@ -643,7 +646,7 @@ static const MemoryRegionOps cs_ioport_ops = {
static int cs4231a_initfn (ISADevice *dev) static int cs4231a_initfn (ISADevice *dev)
{ {
CSState *s = DO_UPCAST (CSState, dev, dev); CSState *s = CS4231A (dev);
isa_init_irq (dev, &s->pic, s->irq); isa_init_irq (dev, &s->pic, s->irq);
@ -652,16 +655,13 @@ static int cs4231a_initfn (ISADevice *dev)
DMA_register_channel (s->dma, cs_dma_read, s); DMA_register_channel (s->dma, cs_dma_read, s);
qemu_register_reset (cs_reset, s);
cs_reset (s);
AUD_register_card ("cs4231a", &s->card); AUD_register_card ("cs4231a", &s->card);
return 0; return 0;
} }
static int cs4231a_init (ISABus *bus) static int cs4231a_init (ISABus *bus)
{ {
isa_create_simple (bus, "cs4231a"); isa_create_simple (bus, TYPE_CS4231A);
return 0; return 0;
} }
@ -677,13 +677,14 @@ static void cs4231a_class_initfn (ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS (klass); DeviceClass *dc = DEVICE_CLASS (klass);
ISADeviceClass *ic = ISA_DEVICE_CLASS (klass); ISADeviceClass *ic = ISA_DEVICE_CLASS (klass);
ic->init = cs4231a_initfn; ic->init = cs4231a_initfn;
dc->reset = cs4231a_reset;
dc->desc = "Crystal Semiconductor CS4231A"; dc->desc = "Crystal Semiconductor CS4231A";
dc->vmsd = &vmstate_cs4231a; dc->vmsd = &vmstate_cs4231a;
dc->props = cs4231a_properties; dc->props = cs4231a_properties;
} }
static const TypeInfo cs4231a_info = { static const TypeInfo cs4231a_info = {
.name = "cs4231a", .name = TYPE_CS4231A,
.parent = TYPE_ISA_DEVICE, .parent = TYPE_ISA_DEVICE,
.instance_size = sizeof (CSState), .instance_size = sizeof (CSState),
.class_init = cs4231a_class_initfn, .class_init = cs4231a_class_initfn,