Commit 00b2f758 authored by xiaoqiang zhao's avatar xiaoqiang zhao Committed by Peter Maydell
Browse files

hw/i2c: QOM'ify bitbang_i2c.c 



Drop the old SysBus init function and use instance_init

Signed-off-by: default avatarxiaoqiang zhao <zxq_yx_007@163.com>
Message-id: 1465815255-21776-2-git-send-email-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 1287f2b3

hw/i2c/bitbang_i2c.c

+6 −8
Original line number Diff line number Diff line
@@ -210,13 +210,14 @@ static void bitbang_i2c_gpio_set(void *opaque, int irq, int level) 
    }

}



static int gpio_i2c_init(SysBusDevice *sbd)

static void gpio_i2c_init(Object *obj)

{

    DeviceState *dev = DEVICE(sbd);

    GPIOI2CState *s = GPIO_I2C(dev);

    DeviceState *dev = DEVICE(obj);

    GPIOI2CState *s = GPIO_I2C(obj);

    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);

    I2CBus *bus;



    memory_region_init(&s->dummy_iomem, OBJECT(s), "gpio_i2c", 0);

    memory_region_init(&s->dummy_iomem, obj, "gpio_i2c", 0);

    sysbus_init_mmio(sbd, &s->dummy_iomem);



    bus = i2c_init_bus(dev, "i2c");
@@ -224,16 +225,12 @@ static int gpio_i2c_init(SysBusDevice *sbd) 


    qdev_init_gpio_in(dev, bitbang_i2c_gpio_set, 2);

    qdev_init_gpio_out(dev, &s->out, 1);



    return 0;

}



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

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = gpio_i2c_init;

    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);

    dc->desc = "Virtual GPIO to I2C bridge";

}
@@ -242,6 +239,7 @@ static const TypeInfo gpio_i2c_info = { 
    .name          = TYPE_GPIO_I2C,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(GPIOI2CState),

    .instance_init = gpio_i2c_init,

    .class_init    = gpio_i2c_class_init,

};