[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 6/8] hw/timer: QOM'ify puv3_ost
From: |
xiaoqiang zhao |
Subject: |
[Qemu-devel] [PATCH v5 6/8] hw/timer: QOM'ify puv3_ost |
Date: |
Thu, 25 Feb 2016 18:30:34 +0800 |
assign puv3_ost_init to puv3_ost_info.instance_init
and drop the SysBusDeviceClass::init
Signed-off-by: xiaoqiang zhao <address@hidden>
---
hw/timer/puv3_ost.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/hw/timer/puv3_ost.c b/hw/timer/puv3_ost.c
index 93650b7..72c87ba 100644
--- a/hw/timer/puv3_ost.c
+++ b/hw/timer/puv3_ost.c
@@ -113,9 +113,10 @@ static void puv3_ost_tick(void *opaque)
}
}
-static int puv3_ost_init(SysBusDevice *dev)
+static void puv3_ost_init(Object *obj)
{
- PUV3OSTState *s = PUV3_OST(dev);
+ PUV3OSTState *s = PUV3_OST(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
s->reg_OIER = 0;
s->reg_OSSR = 0;
@@ -128,25 +129,16 @@ static int puv3_ost_init(SysBusDevice *dev)
s->ptimer = ptimer_init(s->bh);
ptimer_set_freq(s->ptimer, 50 * 1000 * 1000);
- memory_region_init_io(&s->iomem, OBJECT(s), &puv3_ost_ops, s, "puv3_ost",
+ memory_region_init_io(&s->iomem, obj, &puv3_ost_ops, s, "puv3_ost",
PUV3_REGS_OFFSET);
sysbus_init_mmio(dev, &s->iomem);
-
- return 0;
-}
-
-static void puv3_ost_class_init(ObjectClass *klass, void *data)
-{
- SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
-
- sdc->init = puv3_ost_init;
}
static const TypeInfo puv3_ost_info = {
.name = TYPE_PUV3_OST,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(PUV3OSTState),
- .class_init = puv3_ost_class_init,
+ .instance_init = puv3_ost_init,
};
static void puv3_ost_register_type(void)
--
2.1.4
- [Qemu-devel] [PATCH v5 0/8] QOM'ify hw/timer/*, xiaoqiang zhao, 2016/02/25
- [Qemu-devel] [PATCH v5 4/8] hw/timer: QOM'ify m48txx_sysbus (pass 2), xiaoqiang zhao, 2016/02/25
- [Qemu-devel] [PATCH v5 5/8] hw/timer: QOM'ify milkymist_sysctl, xiaoqiang zhao, 2016/02/25
- [Qemu-devel] [PATCH v5 1/8] hw/timer: QOM'ify etraxfs_timer, xiaoqiang zhao, 2016/02/25
- [Qemu-devel] [PATCH v5 8/8] hw/timer: QOM'ify grlib_gptimer, xiaoqiang zhao, 2016/02/25
- [Qemu-devel] [PATCH v5 7/8] hw/timer: QOM'ify slavio_timer, xiaoqiang zhao, 2016/02/25
- [Qemu-devel] [PATCH v5 3/8] hw/timer: QOM'ify m48txx_sysbus (pass 1), xiaoqiang zhao, 2016/02/25
- [Qemu-devel] [PATCH v5 6/8] hw/timer: QOM'ify puv3_ost,
xiaoqiang zhao <=
- [Qemu-devel] [PATCH v5 2/8] hw/timer: QOM'ify lm32_timer, xiaoqiang zhao, 2016/02/25
- Re: [Qemu-devel] [PATCH v5 0/8] QOM'ify hw/timer/*, Peter Maydell, 2016/02/25