[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 111/173] milkymist-hpdmc: QOM cast cleanup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 111/173] milkymist-hpdmc: QOM cast cleanup |
Date: |
Mon, 29 Jul 2013 21:19:28 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/misc/milkymist-hpdmc.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/hw/misc/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c
index a498881..aef135e 100644
--- a/hw/misc/milkymist-hpdmc.c
+++ b/hw/misc/milkymist-hpdmc.c
@@ -40,8 +40,13 @@ enum {
IODELAY_PLL2_LOCKED = (1<<7),
};
+#define TYPE_MILKYMIST_HPDMC "milkymist-hpdmc"
+#define MILKYMIST_HPDMC(obj) \
+ OBJECT_CHECK(MilkymistHpdmcState, (obj), TYPE_MILKYMIST_HPDMC)
+
struct MilkymistHpdmcState {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion regs_region;
uint32_t regs[R_MAX];
@@ -111,7 +116,7 @@ static const MemoryRegionOps hpdmc_mmio_ops = {
static void milkymist_hpdmc_reset(DeviceState *d)
{
- MilkymistHpdmcState *s = container_of(d, MilkymistHpdmcState, busdev.qdev);
+ MilkymistHpdmcState *s = MILKYMIST_HPDMC(d);
int i;
for (i = 0; i < R_MAX; i++) {
@@ -125,7 +130,7 @@ static void milkymist_hpdmc_reset(DeviceState *d)
static int milkymist_hpdmc_init(SysBusDevice *dev)
{
- MilkymistHpdmcState *s = FROM_SYSBUS(typeof(*s), dev);
+ MilkymistHpdmcState *s = MILKYMIST_HPDMC(dev);
memory_region_init_io(&s->regs_region, OBJECT(dev), &hpdmc_mmio_ops, s,
"milkymist-hpdmc", R_MAX * 4);
@@ -156,7 +161,7 @@ static void milkymist_hpdmc_class_init(ObjectClass *klass,
void *data)
}
static const TypeInfo milkymist_hpdmc_info = {
- .name = "milkymist-hpdmc",
+ .name = TYPE_MILKYMIST_HPDMC,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(MilkymistHpdmcState),
.class_init = milkymist_hpdmc_class_init,
--
1.8.1.4
- [Qemu-devel] [PULL 094/173] exynos4210_gic: QOM cast cleanup for exynos4210.gic, (continued)
- [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
- [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 111/173] milkymist-hpdmc: QOM cast cleanup,
Andreas Färber <=
- [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, 2013/07/29
- [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