[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 115/173] slavio_misc: QOM cast cleanup for MiscState
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 115/173] slavio_misc: QOM cast cleanup for MiscState |
Date: |
Mon, 29 Jul 2013 21:19:32 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/misc/slavio_misc.c | 35 ++++++++++++++++++++---------------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c
index 00d9542..1b93a01 100644
--- a/hw/misc/slavio_misc.c
+++ b/hw/misc/slavio_misc.c
@@ -34,8 +34,12 @@
* This also includes the PMC CPU idle controller.
*/
+#define TYPE_SLAVIO_MISC "slavio_misc"
+#define SLAVIO_MISC(obj) OBJECT_CHECK(MiscState, (obj), TYPE_SLAVIO_MISC)
+
typedef struct MiscState {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion cfg_iomem;
MemoryRegion diag_iomem;
MemoryRegion mdm_iomem;
@@ -88,7 +92,7 @@ static void slavio_misc_update_irq(void *opaque)
static void slavio_misc_reset(DeviceState *d)
{
- MiscState *s = container_of(d, MiscState, busdev.qdev);
+ MiscState *s = SLAVIO_MISC(d);
// Diagnostic and system control registers not cleared in reset
s->config = s->aux1 = s->aux2 = s->mctrl = 0;
@@ -418,52 +422,53 @@ static int apc_init1(SysBusDevice *dev)
return 0;
}
-static int slavio_misc_init1(SysBusDevice *dev)
+static int slavio_misc_init1(SysBusDevice *sbd)
{
- MiscState *s = FROM_SYSBUS(MiscState, dev);
+ DeviceState *dev = DEVICE(sbd);
+ MiscState *s = SLAVIO_MISC(dev);
- sysbus_init_irq(dev, &s->irq);
- sysbus_init_irq(dev, &s->fdc_tc);
+ sysbus_init_irq(sbd, &s->irq);
+ sysbus_init_irq(sbd, &s->fdc_tc);
/* 8 bit registers */
/* Slavio control */
memory_region_init_io(&s->cfg_iomem, OBJECT(s), &slavio_cfg_mem_ops, s,
"configuration", MISC_SIZE);
- sysbus_init_mmio(dev, &s->cfg_iomem);
+ sysbus_init_mmio(sbd, &s->cfg_iomem);
/* Diagnostics */
memory_region_init_io(&s->diag_iomem, OBJECT(s), &slavio_diag_mem_ops, s,
"diagnostic", MISC_SIZE);
- sysbus_init_mmio(dev, &s->diag_iomem);
+ sysbus_init_mmio(sbd, &s->diag_iomem);
/* Modem control */
memory_region_init_io(&s->mdm_iomem, OBJECT(s), &slavio_mdm_mem_ops, s,
"modem", MISC_SIZE);
- sysbus_init_mmio(dev, &s->mdm_iomem);
+ sysbus_init_mmio(sbd, &s->mdm_iomem);
/* 16 bit registers */
/* ss600mp diag LEDs */
memory_region_init_io(&s->led_iomem, OBJECT(s), &slavio_led_mem_ops, s,
"leds", MISC_SIZE);
- sysbus_init_mmio(dev, &s->led_iomem);
+ sysbus_init_mmio(sbd, &s->led_iomem);
/* 32 bit registers */
/* System control */
memory_region_init_io(&s->sysctrl_iomem, OBJECT(s),
&slavio_sysctrl_mem_ops, s,
"system-control", MISC_SIZE);
- sysbus_init_mmio(dev, &s->sysctrl_iomem);
+ sysbus_init_mmio(sbd, &s->sysctrl_iomem);
/* AUX 1 (Misc System Functions) */
memory_region_init_io(&s->aux1_iomem, OBJECT(s), &slavio_aux1_mem_ops, s,
"misc-system-functions", MISC_SIZE);
- sysbus_init_mmio(dev, &s->aux1_iomem);
+ sysbus_init_mmio(sbd, &s->aux1_iomem);
/* AUX 2 (Software Powerdown Control) */
memory_region_init_io(&s->aux2_iomem, OBJECT(s), &slavio_aux2_mem_ops, s,
"software-powerdown-control", MISC_SIZE);
- sysbus_init_mmio(dev, &s->aux2_iomem);
+ sysbus_init_mmio(sbd, &s->aux2_iomem);
- qdev_init_gpio_in(&dev->qdev, slavio_set_power_fail, 1);
+ qdev_init_gpio_in(dev, slavio_set_power_fail, 1);
return 0;
}
@@ -479,7 +484,7 @@ static void slavio_misc_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo slavio_misc_info = {
- .name = "slavio_misc",
+ .name = TYPE_SLAVIO_MISC,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(MiscState),
.class_init = slavio_misc_class_init,
--
1.8.1.4
- [Qemu-devel] [PULL 097/173] lm32_pic: QOM cast cleanup, (continued)
- [Qemu-devel] [PULL 097/173] lm32_pic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 105/173] arm_l2x0: Rename l2x0_state to L2x0State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 106/173] arm_l2x0: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 107/173] arm_sysctl: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 108/173] eccmemctl: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 109/173] exynos4210_pmu: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 110/173] lm32_sys: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 112/173] milkymist-pfpu: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 116/173] slavio_misc: QOM cast cleanup for APCState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 113/173] mst_fpga: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 115/173] slavio_misc: QOM cast cleanup for MiscState,
Andreas Färber <=
- [Qemu-devel] [PULL 114/173] puv3_pm: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 123/173] milkymist-minimac2: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 124/173] smc91c111: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 125/173] stellaris_enet: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 126/173] stellaris_enet: Fix NetClientInfo::cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 127/173] xgmac: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 128/173] xilinx_ethlite: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 129/173] ds1225y: Drop bogus qdev field from NvRamState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 131/173] ppce500_spin: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 130/173] ds1225y: QOM cast cleanup for SysBusNvRamState, Andreas Färber, 2013/07/29