diff options
Diffstat (limited to 'hw/i2c/bitbang_i2c.c')
| -rw-r--r-- | hw/i2c/bitbang_i2c.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c index d3a29891f..6ed206020 100644 --- a/hw/i2c/bitbang_i2c.c +++ b/hw/i2c/bitbang_i2c.c @@ -210,14 +210,13 @@ static void bitbang_i2c_gpio_set(void *opaque, int irq, int level) } } -static void gpio_i2c_init(Object *obj) +static int gpio_i2c_init(SysBusDevice *sbd) { - DeviceState *dev = DEVICE(obj); - GPIOI2CState *s = GPIO_I2C(obj); - SysBusDevice *sbd = SYS_BUS_DEVICE(obj); + DeviceState *dev = DEVICE(sbd); + GPIOI2CState *s = GPIO_I2C(dev); I2CBus *bus; - memory_region_init(&s->dummy_iomem, obj, "gpio_i2c", 0); + memory_region_init(&s->dummy_iomem, OBJECT(s), "gpio_i2c", 0); sysbus_init_mmio(sbd, &s->dummy_iomem); bus = i2c_init_bus(dev, "i2c"); @@ -225,12 +224,16 @@ static void gpio_i2c_init(Object *obj) 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"; } @@ -239,7 +242,6 @@ 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, }; |