SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/intc: QOM'ify pl190.c

Browse Source 
Drop the old SysBus init function and use instance_init

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
xiaoqiang.zhao 2016-05-12 13:22:25 +01:00 committed by Peter Maydell
parent f777bda60f
commit e3be8b4f4f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/intc/pl190.c
View File

@ -236,17 +236,17 @@ static void pl190_reset(DeviceState *d)
pl190_update_vectors(s); pl190_update_vectors(s);
} }
static int pl190_init(SysBusDevice *sbd) static void pl190_init(Object *obj)
{ {
DeviceState *dev = DEVICE(sbd); DeviceState *dev = DEVICE(obj);
PL190State *s = PL190(dev); PL190State *s = PL190(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
memory_region_init_io(&s->iomem, OBJECT(s), &pl190_ops, s, "pl190", 0x1000); memory_region_init_io(&s->iomem, obj, &pl190_ops, s, "pl190", 0x1000);
sysbus_init_mmio(sbd, &s->iomem); sysbus_init_mmio(sbd, &s->iomem);
qdev_init_gpio_in(dev, pl190_set_irq, 32); qdev_init_gpio_in(dev, pl190_set_irq, 32);
sysbus_init_irq(sbd, &s->irq); sysbus_init_irq(sbd, &s->irq);
sysbus_init_irq(sbd, &s->fiq); sysbus_init_irq(sbd, &s->fiq);
return 0;
} }
static const VMStateDescription vmstate_pl190 = { static const VMStateDescription vmstate_pl190 = {
@ -271,9 +271,7 @@ static const VMStateDescription vmstate_pl190 = {
static void pl190_class_init(ObjectClass *klass, void *data) static void pl190_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 = pl190_init;
dc->reset = pl190_reset; dc->reset = pl190_reset;
dc->vmsd = &vmstate_pl190; dc->vmsd = &vmstate_pl190;
} }
@ -282,6 +280,7 @@ static const TypeInfo pl190_info = {
.name = TYPE_PL190, .name = TYPE_PL190,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(PL190State), .instance_size = sizeof(PL190State),
.instance_init = pl190_init,
.class_init = pl190_class_init, .class_init = pl190_class_init,
}; };