aboutsummaryrefslogtreecommitdiff
path: root/hw/timer/lm32_timer.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-07-27 14:54:54 +0200
committerAndreas Färber <afaerber@suse.de>2013-07-29 21:07:01 +0200
commitfe54d857056b3cf143fe5aebcf56b7c638d62bc0 (patch)
tree7f4aada8c4954c2b5c508a77c9a92ac331b4dd7d /hw/timer/lm32_timer.c
parent541ab55ff1bdc558473f0dea40deae568551bb85 (diff)
downloadqemu-fe54d857056b3cf143fe5aebcf56b7c638d62bc0.zip
qemu-fe54d857056b3cf143fe5aebcf56b7c638d62bc0.tar.gz
qemu-fe54d857056b3cf143fe5aebcf56b7c638d62bc0.tar.bz2
lm32_timer: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/timer/lm32_timer.c')
-rw-r--r--hw/timer/lm32_timer.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c
index 016dade..986e6a1 100644
--- a/hw/timer/lm32_timer.c
+++ b/hw/timer/lm32_timer.c
@@ -50,8 +50,12 @@ enum {
CR_STOP = (1 << 3),
};
+#define TYPE_LM32_TIMER "lm32-timer"
+#define LM32_TIMER(obj) OBJECT_CHECK(LM32TimerState, (obj), TYPE_LM32_TIMER)
+
struct LM32TimerState {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion iomem;
QEMUBH *bh;
@@ -161,7 +165,7 @@ static void timer_hit(void *opaque)
static void timer_reset(DeviceState *d)
{
- LM32TimerState *s = container_of(d, LM32TimerState, busdev.qdev);
+ LM32TimerState *s = LM32_TIMER(d);
int i;
for (i = 0; i < R_MAX; i++) {
@@ -172,7 +176,7 @@ static void timer_reset(DeviceState *d)
static int lm32_timer_init(SysBusDevice *dev)
{
- LM32TimerState *s = FROM_SYSBUS(typeof(*s), dev);
+ LM32TimerState *s = LM32_TIMER(dev);
sysbus_init_irq(dev, &s->irq);
@@ -217,7 +221,7 @@ static void lm32_timer_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo lm32_timer_info = {
- .name = "lm32-timer",
+ .name = TYPE_LM32_TIMER,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LM32TimerState),
.class_init = lm32_timer_class_init,