intc: xilinx_uartlite: Convert SBD::init -> instance_init
SysBusDevice::init is depracated. Convert to Object::init as prescribed by QOM conventions. Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
parent
aa0f607f61
commit
a373cdb5ce
|
@ -161,18 +161,16 @@ static void irq_handler(void *opaque, int irq, int level)
|
||||||
update_irq(p);
|
update_irq(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int xilinx_intc_init(SysBusDevice *sbd)
|
static void xilinx_intc_init(Object *obj)
|
||||||
{
|
{
|
||||||
DeviceState *dev = DEVICE(sbd);
|
struct xlx_pic *p = XILINX_INTC(obj);
|
||||||
struct xlx_pic *p = XILINX_INTC(dev);
|
|
||||||
|
|
||||||
qdev_init_gpio_in(dev, irq_handler, 32);
|
qdev_init_gpio_in(DEVICE(obj), irq_handler, 32);
|
||||||
sysbus_init_irq(sbd, &p->parent_irq);
|
sysbus_init_irq(SYS_BUS_DEVICE(obj), &p->parent_irq);
|
||||||
|
|
||||||
memory_region_init_io(&p->mmio, OBJECT(p), &pic_ops, p, "xlnx.xps-intc",
|
memory_region_init_io(&p->mmio, obj, &pic_ops, p, "xlnx.xps-intc",
|
||||||
R_MAX * 4);
|
R_MAX * 4);
|
||||||
sysbus_init_mmio(sbd, &p->mmio);
|
sysbus_init_mmio(SYS_BUS_DEVICE(obj), &p->mmio);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Property xilinx_intc_properties[] = {
|
static Property xilinx_intc_properties[] = {
|
||||||
|
@ -183,9 +181,7 @@ static Property xilinx_intc_properties[] = {
|
||||||
static void xilinx_intc_class_init(ObjectClass *klass, void *data)
|
static void xilinx_intc_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 = xilinx_intc_init;
|
|
||||||
dc->props = xilinx_intc_properties;
|
dc->props = xilinx_intc_properties;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -193,6 +189,7 @@ static const TypeInfo xilinx_intc_info = {
|
||||||
.name = TYPE_XILINX_INTC,
|
.name = TYPE_XILINX_INTC,
|
||||||
.parent = TYPE_SYS_BUS_DEVICE,
|
.parent = TYPE_SYS_BUS_DEVICE,
|
||||||
.instance_size = sizeof(struct xlx_pic),
|
.instance_size = sizeof(struct xlx_pic),
|
||||||
|
.instance_init = xilinx_intc_init,
|
||||||
.class_init = xilinx_intc_class_init,
|
.class_init = xilinx_intc_class_init,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue