ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

omap_i2c: QOM cast cleanup 

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-26 18:24:27 +02:00
parent cc3c3b8a22
commit 60ecfcb354
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hw/i2c/omap_i2c.c
View File

@ -21,9 +21,12 @@
#include "hw/arm/omap.h" #include "hw/arm/omap.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#define TYPE_OMAP_I2C "omap_i2c"
#define OMAP_I2C(obj) OBJECT_CHECK(OMAPI2CState, (obj), TYPE_OMAP_I2C)
typedef struct OMAPI2CState { typedef struct OMAPI2CState {
SysBusDevice busdev; SysBusDevice parent_obj;
MemoryRegion iomem; MemoryRegion iomem;
qemu_irq irq; qemu_irq irq;
qemu_irq drq[2]; qemu_irq drq[2];
@ -130,8 +133,8 @@ static void omap_i2c_fifo_run(OMAPI2CState *s)
static void omap_i2c_reset(DeviceState *dev) static void omap_i2c_reset(DeviceState *dev)
{ {
OMAPI2CState *s = FROM_SYSBUS(OMAPI2CState, OMAPI2CState *s = OMAP_I2C(dev);
SYS_BUS_DEVICE(dev));
s->mask = 0; s->mask = 0;
s->stat = 0; s->stat = 0;
s->dma = 0; s->dma = 0;
@ -316,15 +319,17 @@ static void omap_i2c_write(void *opaque, hwaddr addr,
return; return;
} }
if (value & 2) if (value & 2) {
omap_i2c_reset(&s->busdev.qdev); omap_i2c_reset(DEVICE(s));
}
break; break;
case 0x24: /* I2C_CON */ case 0x24: /* I2C_CON */
s->control = value & 0xcf87; s->control = value & 0xcf87;
if (~value & (1 << 15)) { /* I2C_EN */ if (~value & (1 << 15)) { /* I2C_EN */
if (s->revision < OMAP2_INTR_REV) if (s->revision < OMAP2_INTR_REV) {
omap_i2c_reset(&s->busdev.qdev); omap_i2c_reset(DEVICE(s));
}
break; break;
} }
if ((value & (1 << 15)) && !(value & (1 << 10))) { /* MST */ if ((value & (1 << 15)) && !(value & (1 << 10))) { /* MST */
@ -434,9 +439,10 @@ static const MemoryRegionOps omap_i2c_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
static int omap_i2c_init(SysBusDevice *dev) static int omap_i2c_init(SysBusDevice *sbd)
{ {
OMAPI2CState *s = FROM_SYSBUS(OMAPI2CState, dev); DeviceState *dev = DEVICE(sbd);
OMAPI2CState *s = OMAP_I2C(dev);
if (!s->fclk) { if (!s->fclk) {
hw_error("omap_i2c: fclk not connected\n"); hw_error("omap_i2c: fclk not connected\n");
@ -445,13 +451,13 @@ static int omap_i2c_init(SysBusDevice *dev)
/* Note that OMAP1 doesn't have a separate interface clock */ /* Note that OMAP1 doesn't have a separate interface clock */
hw_error("omap_i2c: iclk not connected\n"); hw_error("omap_i2c: iclk not connected\n");
} }
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(sbd, &s->irq);
sysbus_init_irq(dev, &s->drq[0]); sysbus_init_irq(sbd, &s->drq[0]);
sysbus_init_irq(dev, &s->drq[1]); sysbus_init_irq(sbd, &s->drq[1]);
memory_region_init_io(&s->iomem, OBJECT(s), &omap_i2c_ops, s, "omap.i2c", memory_region_init_io(&s->iomem, OBJECT(s), &omap_i2c_ops, s, "omap.i2c",
(s->revision < OMAP2_INTR_REV) ? 0x800 : 0x1000); (s->revision < OMAP2_INTR_REV) ? 0x800 : 0x1000);
sysbus_init_mmio(dev, &s->iomem); sysbus_init_mmio(sbd, &s->iomem);
s->bus = i2c_init_bus(&dev->qdev, NULL); s->bus = i2c_init_bus(dev, NULL);
return 0; return 0;
} }
@ -472,7 +478,7 @@ static void omap_i2c_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo omap_i2c_info = { static const TypeInfo omap_i2c_info = {
.name = "omap_i2c", .name = TYPE_OMAP_I2C,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(OMAPI2CState), .instance_size = sizeof(OMAPI2CState),
.class_init = omap_i2c_class_init, .class_init = omap_i2c_class_init,
@ -485,7 +491,7 @@ static void omap_i2c_register_types(void)
i2c_bus *omap_i2c_bus(DeviceState *omap_i2c) i2c_bus *omap_i2c_bus(DeviceState *omap_i2c)
{ {
OMAPI2CState *s = FROM_SYSBUS(OMAPI2CState, SYS_BUS_DEVICE(omap_i2c)); OMAPI2CState *s = OMAP_I2C(omap_i2c);
return s->bus; return s->bus;
} }