ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/timer: QOM'ify lm32_timer 

* split the old SysBus init function into an instance_init
  and a Device realize function
* use DeviceClass::realize instead of SysBusDeviceClass::init

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Acked-by: Michael Walle <michael@walle.cc>
Tested-by: Michael Walle <michael@walle.cc>
Signed-off-by: Michael Walle <michael@walle.cc>
This commit is contained in:
xiaoqiang zhao 2016-02-22 11:15:27 +08:00 committed by Michael Walle
parent fd2590bccc
commit a18eac523a
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/timer/lm32_timer.c
View File

@ -176,21 +176,26 @@ static void timer_reset(DeviceState *d)
ptimer_stop(s->ptimer); ptimer_stop(s->ptimer);
} }
static int lm32_timer_init(SysBusDevice *dev) static void lm32_timer_init(Object *obj)
{ {
LM32TimerState *s = LM32_TIMER(dev); LM32TimerState *s = LM32_TIMER(obj);
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
s->bh = qemu_bh_new(timer_hit, s); s->bh = qemu_bh_new(timer_hit, s);
s->ptimer = ptimer_init(s->bh); s->ptimer = ptimer_init(s->bh);
ptimer_set_freq(s->ptimer, s->freq_hz);
memory_region_init_io(&s->iomem, OBJECT(s), &timer_ops, s, memory_region_init_io(&s->iomem, obj, &timer_ops, s,
"timer", R_MAX * 4); "timer", R_MAX * 4);
sysbus_init_mmio(dev, &s->iomem); sysbus_init_mmio(dev, &s->iomem);
}
return 0; static void lm32_timer_realize(DeviceState *dev, Error **errp)
{
LM32TimerState *s = LM32_TIMER(dev);
ptimer_set_freq(s->ptimer, s->freq_hz);
} }
static const VMStateDescription vmstate_lm32_timer = { static const VMStateDescription vmstate_lm32_timer = {
@ -213,9 +218,8 @@ static Property lm32_timer_properties[] = {
static void lm32_timer_class_init(ObjectClass *klass, void *data) static void lm32_timer_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = lm32_timer_init; dc->realize = lm32_timer_realize;
dc->reset = timer_reset; dc->reset = timer_reset;
dc->vmsd = &vmstate_lm32_timer; dc->vmsd = &vmstate_lm32_timer;
dc->props = lm32_timer_properties; dc->props = lm32_timer_properties;
@ -225,6 +229,7 @@ static const TypeInfo lm32_timer_info = {
.name = TYPE_LM32_TIMER, .name = TYPE_LM32_TIMER,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LM32TimerState), .instance_size = sizeof(LM32TimerState),
.instance_init = lm32_timer_init,
.class_init = lm32_timer_class_init, .class_init = lm32_timer_class_init,
}; };