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 pl041.c 

split the old SysBus init function into an instance_init
and Device realize function

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Message-id: 20161231011720.3965-3-zxq_yx_007@163.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
xiaoqiang zhao 2016-12-31 09:17:20 +08:00 committed by Gerd Hoffmann
parent c025d0abce
commit 8becab9523
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/audio/pl041.c
View File

@ -521,12 +521,23 @@ static const MemoryRegionOps pl041_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
static int pl041_init(SysBusDevice *dev) static void pl041_init(Object *obj)
{ {
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
PL041State *s = PL041(dev); PL041State *s = PL041(dev);
DBG_L1("pl041_init 0x%08x\n", (uint32_t)s); DBG_L1("pl041_init 0x%08x\n", (uint32_t)s);
/* Connect the device to the sysbus */
memory_region_init_io(&s->iomem, obj, &pl041_ops, s, "pl041", 0x1000);
sysbus_init_mmio(dev, &s->iomem);
sysbus_init_irq(dev, &s->irq);
}
static void pl041_realize(DeviceState *dev, Error **errp)
{
PL041State *s = PL041(dev);
/* Check the device properties */ /* Check the device properties */
switch (s->fifo_depth) { switch (s->fifo_depth) {
case 8: case 8:
@ -545,18 +556,10 @@ static int pl041_init(SysBusDevice *dev)
qemu_log_mask(LOG_UNIMP, qemu_log_mask(LOG_UNIMP,
"pl041: unsupported non-compact fifo depth [%i]\n", "pl041: unsupported non-compact fifo depth [%i]\n",
s->fifo_depth); s->fifo_depth);
return -1;
} }
/* Connect the device to the sysbus */
memory_region_init_io(&s->iomem, OBJECT(s), &pl041_ops, s, "pl041", 0x1000);
sysbus_init_mmio(dev, &s->iomem);
sysbus_init_irq(dev, &s->irq);
/* Init the codec */ /* Init the codec */
lm4549_init(&s->codec, &pl041_request_data, (void *)s); lm4549_init(&s->codec, &pl041_request_data, (void *)s);
return 0;
} }
static const VMStateDescription vmstate_pl041_regfile = { static const VMStateDescription vmstate_pl041_regfile = {
@ -627,9 +630,8 @@ static Property pl041_device_properties[] = {
static void pl041_device_class_init(ObjectClass *klass, void *data) static void pl041_device_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 = pl041_init; dc->realize = pl041_realize;
set_bit(DEVICE_CATEGORY_SOUND, dc->categories); set_bit(DEVICE_CATEGORY_SOUND, dc->categories);
dc->reset = pl041_device_reset; dc->reset = pl041_device_reset;
dc->vmsd = &vmstate_pl041; dc->vmsd = &vmstate_pl041;
@ -640,6 +642,7 @@ static const TypeInfo pl041_device_info = {
.name = TYPE_PL041, .name = TYPE_PL041,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(PL041State), .instance_size = sizeof(PL041State),
.instance_init = pl041_init,
.class_init = pl041_device_class_init, .class_init = pl041_device_class_init,
}; };