haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

bitbang_i2c: QOM cast cleanup

Browse source 
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-26 18:13:46 +02:00
parent a009de46bd
commit cc3c3b8a22
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
hw/i2c/bitbang_i2c.c
View file

@ -185,8 +185,13 @@ bitbang_i2c_interface *bitbang_i2c_init(i2c_bus *bus)
} }
/* GPIO interface. */ /* GPIO interface. */
typedef struct {
SysBusDevice busdev; #define TYPE_GPIO_I2C "gpio_i2c"
#define GPIO_I2C(obj) OBJECT_CHECK(GPIOI2CState, (obj), TYPE_GPIO_I2C)
typedef struct GPIOI2CState {
SysBusDevice parent_obj;
MemoryRegion dummy_iomem; MemoryRegion dummy_iomem;
bitbang_i2c_interface *bitbang; bitbang_i2c_interface *bitbang;
int last_level; int last_level;
@ -204,19 +209,20 @@ static void bitbang_i2c_gpio_set(void *opaque, int irq, int level)
} }
} }
static int gpio_i2c_init(SysBusDevice *dev) static int gpio_i2c_init(SysBusDevice *sbd)
{ {
GPIOI2CState *s = FROM_SYSBUS(GPIOI2CState, dev); DeviceState *dev = DEVICE(sbd);
GPIOI2CState *s = GPIO_I2C(dev);
i2c_bus *bus; i2c_bus *bus;
memory_region_init(&s->dummy_iomem, OBJECT(s), "gpio_i2c", 0); memory_region_init(&s->dummy_iomem, OBJECT(s), "gpio_i2c", 0);
sysbus_init_mmio(dev, &s->dummy_iomem); sysbus_init_mmio(sbd, &s->dummy_iomem);
bus = i2c_init_bus(&dev->qdev, "i2c"); bus = i2c_init_bus(dev, "i2c");
s->bitbang = bitbang_i2c_init(bus); s->bitbang = bitbang_i2c_init(bus);
qdev_init_gpio_in(&dev->qdev, bitbang_i2c_gpio_set, 2); qdev_init_gpio_in(dev, bitbang_i2c_gpio_set, 2);
qdev_init_gpio_out(&dev->qdev, &s->out, 1); qdev_init_gpio_out(dev, &s->out, 1);
return 0; return 0;
} }
@ -232,7 +238,7 @@ static void gpio_i2c_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo gpio_i2c_info = { static const TypeInfo gpio_i2c_info = {
.name = "gpio_i2c", .name = TYPE_GPIO_I2C,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(GPIOI2CState), .instance_size = sizeof(GPIOI2CState),
.class_init = gpio_i2c_class_init, .class_init = gpio_i2c_class_init,