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

hw/arm: QOM'ify highbank.c 



Drop the use of old SysBus init function and use instance_init

Signed-off-by: default avatarxiaoqiang zhao <zxq_yx_007@163.com>
Reviewed-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 3f5ab254

hw/arm/highbank.c

+5 −7
Original line number Diff line number Diff line
@@ -168,23 +168,20 @@ static void highbank_regs_reset(DeviceState *dev) 
    s->regs[0x43] = 0x05F40121;

}



static int highbank_regs_init(SysBusDevice *dev)

static void highbank_regs_init(Object *obj)

{

    HighbankRegsState *s = HIGHBANK_REGISTERS(dev);

    HighbankRegsState *s = HIGHBANK_REGISTERS(obj);

    SysBusDevice *dev = SYS_BUS_DEVICE(obj);



    memory_region_init_io(&s->iomem, OBJECT(s), &hb_mem_ops, s->regs,

    memory_region_init_io(&s->iomem, obj, &hb_mem_ops, s->regs,

                          "highbank_regs", 0x1000);

    sysbus_init_mmio(dev, &s->iomem);



    return 0;

}



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

{

    SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);

    DeviceClass *dc = DEVICE_CLASS(klass);



    sbc->init = highbank_regs_init;

    dc->desc = "Calxeda Highbank registers";

    dc->vmsd = &vmstate_highbank_regs;

    dc->reset = highbank_regs_reset;
@@ -194,6 +191,7 @@ static const TypeInfo highbank_regs_info = { 
    .name          = TYPE_HIGHBANK_REGISTERS,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(HighbankRegsState),

    .instance_init = highbank_regs_init,

    .class_init    = highbank_regs_class_init,

};