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

hw/intc: QOM'ify imx_avic.c 

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:24 +01:00 committed by Peter Maydell
parent 68d71616c0
commit f777bda60f
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/intc/imx_avic.c
View File

@ -321,28 +321,26 @@ static void imx_avic_reset(DeviceState *dev)
memset(s->prio, 0, sizeof s->prio); memset(s->prio, 0, sizeof s->prio);
} }
static int imx_avic_init(SysBusDevice *sbd) static void imx_avic_init(Object *obj)
{ {
DeviceState *dev = DEVICE(sbd); DeviceState *dev = DEVICE(obj);
IMXAVICState *s = IMX_AVIC(dev); IMXAVICState *s = IMX_AVIC(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
memory_region_init_io(&s->iomem, OBJECT(s), &imx_avic_ops, s, memory_region_init_io(&s->iomem, obj, &imx_avic_ops, s,
TYPE_IMX_AVIC, 0x1000); TYPE_IMX_AVIC, 0x1000);
sysbus_init_mmio(sbd, &s->iomem); sysbus_init_mmio(sbd, &s->iomem);
qdev_init_gpio_in(dev, imx_avic_set_irq, IMX_AVIC_NUM_IRQS); qdev_init_gpio_in(dev, imx_avic_set_irq, IMX_AVIC_NUM_IRQS);
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 void imx_avic_class_init(ObjectClass *klass, void *data) static void imx_avic_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 = imx_avic_init;
dc->vmsd = &vmstate_imx_avic; dc->vmsd = &vmstate_imx_avic;
dc->reset = imx_avic_reset; dc->reset = imx_avic_reset;
dc->desc = "i.MX Advanced Vector Interrupt Controller"; dc->desc = "i.MX Advanced Vector Interrupt Controller";
@ -352,6 +350,7 @@ static const TypeInfo imx_avic_info = {
.name = TYPE_IMX_AVIC, .name = TYPE_IMX_AVIC,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(IMXAVICState), .instance_size = sizeof(IMXAVICState),
.instance_init = imx_avic_init,
.class_init = imx_avic_class_init, .class_init = imx_avic_class_init,
}; };