mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

versatile_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:28:26 +02:00
parent 60ecfcb354
commit 93e7f5f42d
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/i2c/versatile_i2c.c
View File

@ -24,8 +24,13 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "bitbang_i2c.h" #include "bitbang_i2c.h"
typedef struct { #define TYPE_VERSATILE_I2C "versatile_i2c"
SysBusDevice busdev; #define VERSATILE_I2C(obj) \
OBJECT_CHECK(VersatileI2CState, (obj), TYPE_VERSATILE_I2C)
typedef struct VersatileI2CState {
SysBusDevice parent_obj;
MemoryRegion iomem; MemoryRegion iomem;
bitbang_i2c_interface *bitbang; bitbang_i2c_interface *bitbang;
int out; int out;
@ -72,16 +77,17 @@ static const MemoryRegionOps versatile_i2c_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
static int versatile_i2c_init(SysBusDevice *dev) static int versatile_i2c_init(SysBusDevice *sbd)
{ {
VersatileI2CState *s = FROM_SYSBUS(VersatileI2CState, dev); DeviceState *dev = DEVICE(sbd);
VersatileI2CState *s = VERSATILE_I2C(dev);
i2c_bus *bus; i2c_bus *bus;
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);
memory_region_init_io(&s->iomem, OBJECT(s), &versatile_i2c_ops, s, memory_region_init_io(&s->iomem, OBJECT(s), &versatile_i2c_ops, s,
"versatile_i2c", 0x1000); "versatile_i2c", 0x1000);
sysbus_init_mmio(dev, &s->iomem); sysbus_init_mmio(sbd, &s->iomem);
return 0; return 0;
} }
@ -93,7 +99,7 @@ static void versatile_i2c_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo versatile_i2c_info = { static const TypeInfo versatile_i2c_info = {
.name = "versatile_i2c", .name = TYPE_VERSATILE_I2C,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(VersatileI2CState), .instance_size = sizeof(VersatileI2CState),
.class_init = versatile_i2c_class_init, .class_init = versatile_i2c_class_init,