[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 159/173] puv3_ost: QOM cast cleanup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 159/173] puv3_ost: QOM cast cleanup |
Date: |
Mon, 29 Jul 2013 21:20:16 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/timer/puv3_ost.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/timer/puv3_ost.c b/hw/timer/puv3_ost.c
index 63f2c9f..4bd2b76 100644
--- a/hw/timer/puv3_ost.c
+++ b/hw/timer/puv3_ost.c
@@ -14,9 +14,13 @@
#undef DEBUG_PUV3
#include "hw/unicore32/puv3.h"
+#define TYPE_PUV3_OST "puv3_ost"
+#define PUV3_OST(obj) OBJECT_CHECK(PUV3OSTState, (obj), TYPE_PUV3_OST)
+
/* puv3 ostimer implementation. */
-typedef struct {
- SysBusDevice busdev;
+typedef struct PUV3OSTState {
+ SysBusDevice parent_obj;
+
MemoryRegion iomem;
QEMUBH *bh;
qemu_irq irq;
@@ -109,7 +113,7 @@ static void puv3_ost_tick(void *opaque)
static int puv3_ost_init(SysBusDevice *dev)
{
- PUV3OSTState *s = FROM_SYSBUS(PUV3OSTState, dev);
+ PUV3OSTState *s = PUV3_OST(dev);
s->reg_OIER = 0;
s->reg_OSSR = 0;
@@ -137,7 +141,7 @@ static void puv3_ost_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo puv3_ost_info = {
- .name = "puv3_ost",
+ .name = TYPE_PUV3_OST,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(PUV3OSTState),
.class_init = puv3_ost_class_init,
--
1.8.1.4
- [Qemu-devel] [PULL 150/173] exynos4210_mct: QOM cast cleanup, (continued)
- [Qemu-devel] [PULL 150/173] exynos4210_mct: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 149/173] etraxfs_timer: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 152/173] exynos4210_rtc: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 151/173] exynos4210_pwm: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 153/173] grlib_gptimer: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 154/173] lm32_timer: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 155/173] m48t59: QOM cast cleanup for M48t59SysBusState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 156/173] milkymist-sysctl: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 157/173] pl031: Rename pl031_state to PL031State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 158/173] pl031: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 159/173] puv3_ost: QOM cast cleanup,
Andreas Färber <=
- [Qemu-devel] [PULL 160/173] pxa2xx_timer: QOM'ify pxa25x-timer and pxa27x-timer, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 161/173] slavio_timer: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 162/173] tusb6010: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 164/173] sysbus: Drop FROM_SYSBUS(), Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 165/173] sysbus: Remove unused sysbus_new() prototype, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 163/173] xilinx_timer: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 103/173] slavio_intctl: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 099/173] pl190: Rename pl190_state to PL190State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 173/173] sysbus: QOM parent field cleanup for SysBusDevice, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 169/173] kvmvapic: QOM cast cleanup, Andreas Färber, 2013/07/29