david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/intc: QOM'ify omap_intc.c

Browse Source 
* Split the old SysBus init into an instance_init and a
  DeviceClass::realize function
* Drop the old SysBus init function and use instance_init

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
xiaoqiang zhao 2016-05-12 13:22:25 +01:00 committed by Peter Maydell
parent 22c70d8a6a
commit 0a750e2a78
1 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
hw/intc/omap_intc.c
View File

@ -22,6 +22,7 @@
#include "hw/arm/omap.h" #include "hw/arm/omap.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qapi/error.h"
/* Interrupt Handlers */ /* Interrupt Handlers */
struct omap_intr_handler_bank_s { struct omap_intr_handler_bank_s {
@ -363,23 +364,28 @@ static void omap_inth_reset(DeviceState *dev)
qemu_set_irq(s->parent_intr[1], 0); qemu_set_irq(s->parent_intr[1], 0);
} }
static int omap_intc_init(SysBusDevice *sbd) static void omap_intc_init(Object *obj)
{ {
DeviceState *dev = DEVICE(sbd); DeviceState *dev = DEVICE(obj);
struct omap_intr_handler_s *s = OMAP_INTC(dev); struct omap_intr_handler_s *s = OMAP_INTC(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
if (!s->iclk) {
error_report("omap-intc: clk not connected");
return -1;
}
s->nbanks = 1; s->nbanks = 1;
sysbus_init_irq(sbd, &s->parent_intr[0]); sysbus_init_irq(sbd, &s->parent_intr[0]);
sysbus_init_irq(sbd, &s->parent_intr[1]); sysbus_init_irq(sbd, &s->parent_intr[1]);
qdev_init_gpio_in(dev, omap_set_intr, s->nbanks * 32); qdev_init_gpio_in(dev, omap_set_intr, s->nbanks * 32);
memory_region_init_io(&s->mmio, OBJECT(s), &omap_inth_mem_ops, s, memory_region_init_io(&s->mmio, obj, &omap_inth_mem_ops, s,
"omap-intc", s->size); "omap-intc", s->size);
sysbus_init_mmio(sbd, &s->mmio); sysbus_init_mmio(sbd, &s->mmio);
return 0; }
static void omap_intc_realize(DeviceState *dev, Error **errp)
{
struct omap_intr_handler_s *s = OMAP_INTC(dev);
if (!s->iclk) {
error_setg(errp, "omap-intc: clk not connected");
}
} }
static Property omap_intc_properties[] = { static Property omap_intc_properties[] = {
@ -391,18 +397,18 @@ static Property omap_intc_properties[] = {
static void omap_intc_class_init(ObjectClass *klass, void *data) static void omap_intc_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 = omap_intc_init;
dc->reset = omap_inth_reset; dc->reset = omap_inth_reset;
dc->props = omap_intc_properties; dc->props = omap_intc_properties;
/* Reason: pointer property "clk" */ /* Reason: pointer property "clk" */
dc->cannot_instantiate_with_device_add_yet = true; dc->cannot_instantiate_with_device_add_yet = true;
dc->realize = omap_intc_realize;
} }
static const TypeInfo omap_intc_info = { static const TypeInfo omap_intc_info = {
.name = "omap-intc", .name = "omap-intc",
.parent = TYPE_OMAP_INTC, .parent = TYPE_OMAP_INTC,
.instance_init = omap_intc_init,
.class_init = omap_intc_class_init, .class_init = omap_intc_class_init,
}; };
@ -605,28 +611,34 @@ static const MemoryRegionOps omap2_inth_mem_ops = {
}, },
}; };
static int omap2_intc_init(SysBusDevice *sbd) static void omap2_intc_init(Object *obj)
{ {
DeviceState *dev = DEVICE(sbd); DeviceState *dev = DEVICE(obj);
struct omap_intr_handler_s *s = OMAP_INTC(dev); struct omap_intr_handler_s *s = OMAP_INTC(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
if (!s->iclk) {
error_report("omap2-intc: iclk not connected");
return -1;
}
if (!s->fclk) {
error_report("omap2-intc: fclk not connected");
return -1;
}
s->level_only = 1; s->level_only = 1;
s->nbanks = 3; s->nbanks = 3;
sysbus_init_irq(sbd, &s->parent_intr[0]); sysbus_init_irq(sbd, &s->parent_intr[0]);
sysbus_init_irq(sbd, &s->parent_intr[1]); sysbus_init_irq(sbd, &s->parent_intr[1]);
qdev_init_gpio_in(dev, omap_set_intr_noedge, s->nbanks * 32); qdev_init_gpio_in(dev, omap_set_intr_noedge, s->nbanks * 32);
memory_region_init_io(&s->mmio, OBJECT(s), &omap2_inth_mem_ops, s, memory_region_init_io(&s->mmio, obj, &omap2_inth_mem_ops, s,
"omap2-intc", 0x1000); "omap2-intc", 0x1000);
sysbus_init_mmio(sbd, &s->mmio); sysbus_init_mmio(sbd, &s->mmio);
return 0; }
static void omap2_intc_realize(DeviceState *dev, Error **errp)
{
struct omap_intr_handler_s *s = OMAP_INTC(dev);
if (!s->iclk) {
error_setg(errp, "omap2-intc: iclk not connected");
return;
}
if (!s->fclk) {
error_setg(errp, "omap2-intc: fclk not connected");
return;
}
} }
static Property omap2_intc_properties[] = { static Property omap2_intc_properties[] = {
@ -640,18 +652,18 @@ static Property omap2_intc_properties[] = {
static void omap2_intc_class_init(ObjectClass *klass, void *data) static void omap2_intc_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 = omap2_intc_init;
dc->reset = omap_inth_reset; dc->reset = omap_inth_reset;
dc->props = omap2_intc_properties; dc->props = omap2_intc_properties;
/* Reason: pointer property "iclk", "fclk" */ /* Reason: pointer property "iclk", "fclk" */
dc->cannot_instantiate_with_device_add_yet = true; dc->cannot_instantiate_with_device_add_yet = true;
dc->realize = omap2_intc_realize;
} }
static const TypeInfo omap2_intc_info = { static const TypeInfo omap2_intc_info = {
.name = "omap2-intc", .name = "omap2-intc",
.parent = TYPE_OMAP_INTC, .parent = TYPE_OMAP_INTC,
.instance_init = omap2_intc_init,
.class_init = omap2_intc_class_init, .class_init = omap2_intc_class_init,
}; };