Include qemu/module.h where needed, drop it from qemu-common.h

[qemu.git] / hw / timer / puv3_ost.c

diff --git a/hw/timer/puv3_ost.c b/hw/timer/puv3_ost.c
index 63f2c9f0287274e55ba061ceba87474aba79cc40..4a8ae37ffd55da39fd886926e401dd5759ff0501 100644 (file)
--- a/hw/timer/puv3_ost.c
+++ b/hw/timer/puv3_ost.c
@@ -8,15 +8,23 @@
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */

+
+#include "qemu/osdep.h"

 #include "hw/sysbus.h"
 #include "hw/ptimer.h"
 #include "hw/sysbus.h"
 #include "hw/ptimer.h"

+#include "qemu/main-loop.h"
+#include "qemu/module.h"

 
 #undef DEBUG_PUV3
 #include "hw/unicore32/puv3.h"
 
 
 #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. */
 /* puv3 ostimer implementation. */

-typedef struct {
-    SysBusDevice busdev;
+typedef struct PUV3OSTState {
+    SysBusDevice parent_obj;
+

     MemoryRegion iomem;
     QEMUBH *bh;
     qemu_irq irq;
     MemoryRegion iomem;
     QEMUBH *bh;
     qemu_irq irq;


@@ -107,37 +115,36 @@ static void puv3_ost_tick(void *opaque)
     }
 }
 
     }
 }
 

-static int puv3_ost_init(SysBusDevice *dev)
+static void puv3_ost_realize(DeviceState *dev, Error **errp)

 {
 {

-    PUV3OSTState *s = FROM_SYSBUS(PUV3OSTState, dev);
+    PUV3OSTState *s = PUV3_OST(dev);
+    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);

 
     s->reg_OIER = 0;
     s->reg_OSSR = 0;
     s->reg_OSMR0 = 0;
     s->reg_OSCR = 0;
 
 
     s->reg_OIER = 0;
     s->reg_OSSR = 0;
     s->reg_OSMR0 = 0;
     s->reg_OSCR = 0;
 

-    sysbus_init_irq(dev, &s->irq);
+    sysbus_init_irq(sbd, &s->irq);

 
     s->bh = qemu_bh_new(puv3_ost_tick, s);
 
     s->bh = qemu_bh_new(puv3_ost_tick, s);

-    s->ptimer = ptimer_init(s->bh);
+    s->ptimer = ptimer_init(s->bh, PTIMER_POLICY_DEFAULT);

     ptimer_set_freq(s->ptimer, 50 * 1000 * 1000);
 
     memory_region_init_io(&s->iomem, OBJECT(s), &puv3_ost_ops, s, "puv3_ost",
             PUV3_REGS_OFFSET);
     ptimer_set_freq(s->ptimer, 50 * 1000 * 1000);
 
     memory_region_init_io(&s->iomem, OBJECT(s), &puv3_ost_ops, s, "puv3_ost",
             PUV3_REGS_OFFSET);

-    sysbus_init_mmio(dev, &s->iomem);
-
-    return 0;
+    sysbus_init_mmio(sbd, &s->iomem);

 }
 
 static void puv3_ost_class_init(ObjectClass *klass, void *data)
 {
 }
 
 static void puv3_ost_class_init(ObjectClass *klass, void *data)
 {

-    SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
+    DeviceClass *dc = DEVICE_CLASS(klass);

 
 

-    sdc->init = puv3_ost_init;
+    dc->realize = puv3_ost_realize;

 }
 
 static const TypeInfo puv3_ost_info = {
 }
 
 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,
     .parent = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(PUV3OSTState),
     .class_init = puv3_ost_class_init,