[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 056/173] strongarm: QOM cast cleanup for StrongARMGPI
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 056/173] strongarm: QOM cast cleanup for StrongARMGPIOInfo |
Date: |
Mon, 29 Jul 2013 21:18:33 +0200 |
Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/arm/strongarm.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index 78211a0..efb56b3 100644
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -464,6 +464,10 @@ static const TypeInfo strongarm_rtc_sysbus_info = {
#define GEDR 0x18
#define GAFR 0x1c
+#define TYPE_STRONGARM_GPIO "strongarm-gpio"
+#define STRONGARM_GPIO(obj) \
+ OBJECT_CHECK(StrongARMGPIOInfo, (obj), TYPE_STRONGARM_GPIO)
+
typedef struct StrongARMGPIOInfo StrongARMGPIOInfo;
struct StrongARMGPIOInfo {
SysBusDevice busdev;
@@ -630,7 +634,7 @@ static DeviceState *strongarm_gpio_init(hwaddr base,
DeviceState *dev;
int i;
- dev = qdev_create(NULL, "strongarm-gpio");
+ dev = qdev_create(NULL, TYPE_STRONGARM_GPIO);
qdev_init_nofail(dev);
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
@@ -641,24 +645,23 @@ static DeviceState *strongarm_gpio_init(hwaddr base,
return dev;
}
-static int strongarm_gpio_initfn(SysBusDevice *dev)
+static int strongarm_gpio_initfn(SysBusDevice *sbd)
{
- StrongARMGPIOInfo *s;
+ DeviceState *dev = DEVICE(sbd);
+ StrongARMGPIOInfo *s = STRONGARM_GPIO(dev);
int i;
- s = FROM_SYSBUS(StrongARMGPIOInfo, dev);
-
- qdev_init_gpio_in(&dev->qdev, strongarm_gpio_set, 28);
- qdev_init_gpio_out(&dev->qdev, s->handler, 28);
+ qdev_init_gpio_in(dev, strongarm_gpio_set, 28);
+ qdev_init_gpio_out(dev, s->handler, 28);
memory_region_init_io(&s->iomem, OBJECT(s), &strongarm_gpio_ops, s,
"gpio", 0x1000);
- sysbus_init_mmio(dev, &s->iomem);
+ sysbus_init_mmio(sbd, &s->iomem);
for (i = 0; i < 11; i++) {
- sysbus_init_irq(dev, &s->irqs[i]);
+ sysbus_init_irq(sbd, &s->irqs[i]);
}
- sysbus_init_irq(dev, &s->irqX);
+ sysbus_init_irq(sbd, &s->irqX);
return 0;
}
@@ -690,7 +693,7 @@ static void strongarm_gpio_class_init(ObjectClass *klass,
void *data)
}
static const TypeInfo strongarm_gpio_info = {
- .name = "strongarm-gpio",
+ .name = TYPE_STRONGARM_GPIO,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(StrongARMGPIOInfo),
.class_init = strongarm_gpio_class_init,
--
1.8.1.4
- [Qemu-devel] [PULL 046/173] pxa2xx: QOM cast cleanup for PXA2xxI2CState, (continued)
- [Qemu-devel] [PULL 046/173] pxa2xx: QOM cast cleanup for PXA2xxI2CState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 047/173] pxa2xx_gpio: QOM cast cleanup for PXA2xxGPIOInfo, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 048/173] pxa2xx_pic: QOM cast cleanup for PXA2xxPICState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 050/173] spitz: QOM cast cleanup for SpitzKeyboardState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 049/173] spitz: QOM cast cleanup for SLNANDState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 051/173] stellaris: QOM cast cleanup for gptm_state, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 052/173] stellaris: QOM cast cleanup for stellaris_i2c_state, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 053/173] stellaris: QOM cast cleanup for stellaris_adc_state, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 054/173] strongarm: QOM cast cleanup for StrongARMPICState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 055/173] strongarm: QOM cast cleanup for StrongARMRTCState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 056/173] strongarm: QOM cast cleanup for StrongARMGPIOInfo,
Andreas Färber <=
- [Qemu-devel] [PULL 057/173] strongarm: QOM cast cleanup for StrongARMPPCInfo, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 058/173] strongarm: QOM cast cleanup for StrongARMUARTState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 059/173] strongarm: QOM cast cleanup for StrongARMSSPState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 060/173] versatilepb: QOM cast cleanup for vpb_sic_state, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 061/173] cadence_uart: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 066/173] lm32_juart: Relocate and tidy header, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 062/173] escc: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 063/173] exynos4210_uart: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 064/173] grlib_apbuart: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 065/173] imx_serial: QOM cast cleanup, Andreas Färber, 2013/07/29