Commit a1f42e0c authored by xiaoqiang.zhao's avatar xiaoqiang.zhao Committed by Peter Maydell
Browse files

hw/arm: QOM'ify integratorcp.c 



* Drop the use of old SysBus init function and use instance_init
* Remove the empty 'icp_pic_class_init' from Typeinfo

Signed-off-by: default avatarxiaoqiang zhao <zxq_yx_007@163.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent ff7a27c1

hw/arm/integratorcp.c

+12 −20
Original line number Diff line number Diff line
@@ -242,9 +242,10 @@ static const MemoryRegionOps integratorcm_ops = { 
    .endianness = DEVICE_NATIVE_ENDIAN,

};



static int integratorcm_init(SysBusDevice *dev)

static void integratorcm_init(Object *obj)

{

    IntegratorCMState *s = INTEGRATOR_CM(dev);

    IntegratorCMState *s = INTEGRATOR_CM(obj);

    SysBusDevice *dev = SYS_BUS_DEVICE(obj);



    s->cm_osc = 0x01000048;

    /* ??? What should the high bits of this value be?  */
@@ -269,17 +270,16 @@ static int integratorcm_init(SysBusDevice *dev) 
    s->cm_init = 0x00000112;

    s->cm_refcnt_offset = muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL), 24,

                                   1000);

    memory_region_init_ram(&s->flash, OBJECT(s), "integrator.flash", 0x100000,

    memory_region_init_ram(&s->flash, obj, "integrator.flash", 0x100000,

                           &error_fatal);

    vmstate_register_ram_global(&s->flash);



    memory_region_init_io(&s->iomem, OBJECT(s), &integratorcm_ops, s,

    memory_region_init_io(&s->iomem, obj, &integratorcm_ops, s,

                          "integratorcm", 0x00800000);

    sysbus_init_mmio(dev, &s->iomem);



    integratorcm_do_remap(s);

    /* ??? Save/restore.  */

    return 0;

}



/* Integrator/CP hardware emulation.  */
@@ -394,18 +394,18 @@ static const MemoryRegionOps icp_pic_ops = { 
    .endianness = DEVICE_NATIVE_ENDIAN,

};



static int icp_pic_init(SysBusDevice *sbd)

static void icp_pic_init(Object *obj)

{

    DeviceState *dev = DEVICE(sbd);

    icp_pic_state *s = INTEGRATOR_PIC(dev);

    DeviceState *dev = DEVICE(obj);

    icp_pic_state *s = INTEGRATOR_PIC(obj);

    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);



    qdev_init_gpio_in(dev, icp_pic_set_irq, 32);

    sysbus_init_irq(sbd, &s->parent_irq);

    sysbus_init_irq(sbd, &s->parent_fiq);

    memory_region_init_io(&s->iomem, OBJECT(s), &icp_pic_ops, s,

    memory_region_init_io(&s->iomem, obj, &icp_pic_ops, s,

                          "icp-pic", 0x00800000);

    sysbus_init_mmio(sbd, &s->iomem);

    return 0;

}



/* CP control registers.  */
@@ -630,9 +630,7 @@ static Property core_properties[] = { 
static void core_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = integratorcm_init;

    dc->props = core_properties;

}
@@ -640,21 +638,15 @@ static const TypeInfo core_info = { 
    .name          = TYPE_INTEGRATOR_CM,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(IntegratorCMState),

    .instance_init = integratorcm_init,

    .class_init    = core_class_init,

};



static void icp_pic_class_init(ObjectClass *klass, void *data)

{

    SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);



    sdc->init = icp_pic_init;

}



static const TypeInfo icp_pic_info = {

    .name          = TYPE_INTEGRATOR_PIC,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(icp_pic_state),

    .class_init    = icp_pic_class_init,

    .instance_init = icp_pic_init,

};



static const TypeInfo icp_ctrl_regs_info = {