[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/14] hw/timer: QOM'ify milkymist_sysctl
From: |
xiaoqiang zhao |
Subject: |
[Qemu-devel] [PATCH v2 09/14] hw/timer: QOM'ify milkymist_sysctl |
Date: |
Wed, 27 Jan 2016 10:54:43 +0800 |
* split milkymist_sysctl_init into milkymist_sysctl_info.instance_init and
milkymist_sysctl_realize
* use DeviceClass::realize instead of SysBusDeviceClass::init
Signed-off-by: xiaoqiang zhao <address@hidden>
---
hw/timer/milkymist-sysctl.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c
index 30535a4..e29c823 100644
--- a/hw/timer/milkymist-sysctl.c
+++ b/hw/timer/milkymist-sysctl.c
@@ -269,9 +269,10 @@ static void milkymist_sysctl_reset(DeviceState *d)
s->regs[R_GPIO_IN] = s->strappings;
}
-static int milkymist_sysctl_init(SysBusDevice *dev)
+static void milkymist_sysctl_init(Object *obj)
{
- MilkymistSysctlState *s = MILKYMIST_SYSCTL(dev);
+ MilkymistSysctlState *s = MILKYMIST_SYSCTL(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
sysbus_init_irq(dev, &s->gpio_irq);
sysbus_init_irq(dev, &s->timer0_irq);
@@ -281,14 +282,18 @@ static int milkymist_sysctl_init(SysBusDevice *dev)
s->bh1 = qemu_bh_new(timer1_hit, s);
s->ptimer0 = ptimer_init(s->bh0);
s->ptimer1 = ptimer_init(s->bh1);
- ptimer_set_freq(s->ptimer0, s->freq_hz);
- ptimer_set_freq(s->ptimer1, s->freq_hz);
memory_region_init_io(&s->regs_region, OBJECT(s), &sysctl_mmio_ops, s,
"milkymist-sysctl", R_MAX * 4);
sysbus_init_mmio(dev, &s->regs_region);
+}
- return 0;
+static void milkymist_sysctl_realize(DeviceState *dev, Error **errp)
+{
+ MilkymistSysctlState *s = MILKYMIST_SYSCTL(dev);
+
+ ptimer_set_freq(s->ptimer0, s->freq_hz);
+ ptimer_set_freq(s->ptimer1, s->freq_hz);
}
static const VMStateDescription vmstate_milkymist_sysctl = {
@@ -318,9 +323,8 @@ static Property milkymist_sysctl_properties[] = {
static void milkymist_sysctl_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = milkymist_sysctl_init;
+ dc->realize = milkymist_sysctl_realize;
dc->reset = milkymist_sysctl_reset;
dc->vmsd = &vmstate_milkymist_sysctl;
dc->props = milkymist_sysctl_properties;
@@ -330,6 +334,7 @@ static const TypeInfo milkymist_sysctl_info = {
.name = TYPE_MILKYMIST_SYSCTL,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(MilkymistSysctlState),
+ .instance_init = milkymist_sysctl_init,
.class_init = milkymist_sysctl_class_init,
};
--
2.1.4
- [Qemu-devel] [PATCH v2 00/14] QOM'ify hw/timer/*, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH v2 01/14] hw/timer: QOM'ify arm_timer, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH v2 02/14] hw/timer: QOM'ify etraxfs_timer, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH v2 03/14] hw/timer: QOM'ify exynos4210_mct, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH v2 04/14] hw/timer: QOM'ify exynos4210_pwm, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH v2 06/14] hw/timer: QOM'ify grlib_gptimer, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH v2 07/14] hw/timer: QOM'ify lm32_timer, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH v2 09/14] hw/timer: QOM'ify milkymist_sysctl,
xiaoqiang zhao <=
- [Qemu-devel] [PATCH v2 05/14] hw/timer: QOM'ify exynos4210_rtc, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH v2 08/14] hw/timer: QOM'ify m48txx_sysbus, xiaoqiang zhao, 2016/01/26