[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 087/173] versatile_i2c: QOM cast cleanup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 087/173] versatile_i2c: QOM cast cleanup |
Date: |
Mon, 29 Jul 2013 21:19:04 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/i2c/versatile_i2c.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/hw/i2c/versatile_i2c.c b/hw/i2c/versatile_i2c.c
index 204dd3d..02e9f17 100644
--- a/hw/i2c/versatile_i2c.c
+++ b/hw/i2c/versatile_i2c.c
@@ -24,8 +24,13 @@
#include "hw/sysbus.h"
#include "bitbang_i2c.h"
-typedef struct {
- SysBusDevice busdev;
+#define TYPE_VERSATILE_I2C "versatile_i2c"
+#define VERSATILE_I2C(obj) \
+ OBJECT_CHECK(VersatileI2CState, (obj), TYPE_VERSATILE_I2C)
+
+typedef struct VersatileI2CState {
+ SysBusDevice parent_obj;
+
MemoryRegion iomem;
bitbang_i2c_interface *bitbang;
int out;
@@ -72,16 +77,17 @@ static const MemoryRegionOps versatile_i2c_ops = {
.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;
- bus = i2c_init_bus(&dev->qdev, "i2c");
+ bus = i2c_init_bus(dev, "i2c");
s->bitbang = bitbang_i2c_init(bus);
memory_region_init_io(&s->iomem, OBJECT(s), &versatile_i2c_ops, s,
"versatile_i2c", 0x1000);
- sysbus_init_mmio(dev, &s->iomem);
+ sysbus_init_mmio(sbd, &s->iomem);
return 0;
}
@@ -93,7 +99,7 @@ static void versatile_i2c_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo versatile_i2c_info = {
- .name = "versatile_i2c",
+ .name = TYPE_VERSATILE_I2C,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(VersatileI2CState),
.class_init = versatile_i2c_class_init,
--
1.8.1.4
- [Qemu-devel] [PULL 077/173] sparc32_dma: QOM cast cleanup, (continued)
- [Qemu-devel] [PULL 077/173] sparc32_dma: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 079/173] omap_gpio: QOM cast cleanup for omap_gpif_s, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 080/173] omap_gpio: QOM cast cleanup for omap2_gpif_s, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 078/173] sun4m_iommu: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 081/173] pl061: Rename pl061_state to PL061State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 083/173] puv3_gpio: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 085/173] bitbang_i2c: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 082/173] pl061: QOM'ify pl061 and pl061_luminary, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 086/173] omap_i2c: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 084/173] gpio/zaurus: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 087/173] versatile_i2c: QOM cast cleanup,
Andreas Färber <=
- [Qemu-devel] [PULL 088/173] milkymist-softusb: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 090/173] pl050: QOM'ify pl050_keyboard and pl050_mouse, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 091/173] arm_gic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 089/173] pl050: Rename pl050_state to PL050State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 092/173] etraxfs_pic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 093/173] exynos4210_combiner: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 096/173] grlib_irqmp: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 094/173] exynos4210_gic: QOM cast cleanup for exynos4210.gic, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 095/173] exynos4210_gic: QOM cast cleanup for exynos4210.irq_gate, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 097/173] lm32_pic: QOM cast cleanup, Andreas Färber, 2013/07/29