ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/audio: QOM'ify cs4231.c 

Drop the old SysBus init function and use instance_init

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Message-id: 1463111220-30335-2-git-send-email-zxq_yx_007@163.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
xiaoqiang zhao 2016-05-13 11:46:57 +08:00 committed by Gerd Hoffmann
parent e58ff62d58
commit ff2df541bb
1 changed files with 5 additions and 7 deletions
hw/audio
cs4231.c

12
hw/audio/cs4231.c
View File

@ -145,16 +145,15 @@ static const VMStateDescription vmstate_cs4231 = {
} }
}; };
static int cs4231_init1(SysBusDevice *dev) static void cs4231_init(Object *obj)
{ {
CSState *s = CS4231(dev); CSState *s = CS4231(obj);
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
memory_region_init_io(&s->iomem, OBJECT(s), &cs_mem_ops, s, "cs4321", memory_region_init_io(&s->iomem, obj, &cs_mem_ops, s, "cs4321",
CS_SIZE); CS_SIZE);
sysbus_init_mmio(dev, &s->iomem); sysbus_init_mmio(dev, &s->iomem);
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
return 0;
} }
static Property cs4231_properties[] = { static Property cs4231_properties[] = {
@ -164,9 +163,7 @@ static Property cs4231_properties[] = {
static void cs4231_class_init(ObjectClass *klass, void *data) static void cs4231_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = cs4231_init1;
dc->reset = cs_reset; dc->reset = cs_reset;
dc->vmsd = &vmstate_cs4231; dc->vmsd = &vmstate_cs4231;
dc->props = cs4231_properties; dc->props = cs4231_properties;
@ -176,6 +173,7 @@ static const TypeInfo cs4231_info = {
.name = TYPE_CS4231, .name = TYPE_CS4231,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(CSState), .instance_size = sizeof(CSState),
.instance_init = cs4231_init,
.class_init = cs4231_class_init, .class_init = cs4231_class_init,
}; };