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

arm11mpcore: QOM cast cleanups for mpcore_rirq_state 

Introduce a type constant, use QOM casts, rename the parent field and
prepare for QOM realize.

Reviewed-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-25 00:11:10 +02:00
parent 56fc028166
commit 45c0a675f9
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/cpu/arm11mpcore.c
View File

@ -161,11 +161,16 @@ static int mpcore_priv_init(SysBusDevice *sbd)
return 0; return 0;
} }
#define TYPE_REALVIEW_MPCORE_RIRQ "realview_mpcore"
#define REALVIEW_MPCORE_RIRQ(obj) \
OBJECT_CHECK(mpcore_rirq_state, (obj), TYPE_REALVIEW_MPCORE_RIRQ)
/* Dummy PIC to route IRQ lines. The baseboard has 4 independent IRQ /* Dummy PIC to route IRQ lines. The baseboard has 4 independent IRQ
controllers. The output of these, plus some of the raw input lines controllers. The output of these, plus some of the raw input lines
are fed into a single SMP-aware interrupt controller on the CPU. */ are fed into a single SMP-aware interrupt controller on the CPU. */
typedef struct { typedef struct {
SysBusDevice busdev; SysBusDevice parent_obj;
SysBusDevice *priv; SysBusDevice *priv;
qemu_irq cpuic[32]; qemu_irq cpuic[32];
qemu_irq rvic[4][64]; qemu_irq rvic[4][64];
@ -196,9 +201,10 @@ static void mpcore_rirq_set_irq(void *opaque, int irq, int level)
} }
} }
static int realview_mpcore_init(SysBusDevice *dev) static int realview_mpcore_init(SysBusDevice *sbd)
{ {
mpcore_rirq_state *s = FROM_SYSBUS(mpcore_rirq_state, dev); DeviceState *dev = DEVICE(sbd);
mpcore_rirq_state *s = REALVIEW_MPCORE_RIRQ(dev);
DeviceState *gic; DeviceState *gic;
DeviceState *priv; DeviceState *priv;
int n; int n;
@ -208,7 +214,7 @@ static int realview_mpcore_init(SysBusDevice *dev)
qdev_prop_set_uint32(priv, "num-cpu", s->num_cpu); qdev_prop_set_uint32(priv, "num-cpu", s->num_cpu);
qdev_init_nofail(priv); qdev_init_nofail(priv);
s->priv = SYS_BUS_DEVICE(priv); s->priv = SYS_BUS_DEVICE(priv);
sysbus_pass_irq(dev, s->priv); sysbus_pass_irq(sbd, s->priv);
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
s->cpuic[i] = qdev_get_gpio_in(priv, i); s->cpuic[i] = qdev_get_gpio_in(priv, i);
} }
@ -220,8 +226,8 @@ static int realview_mpcore_init(SysBusDevice *dev)
s->rvic[n][i] = qdev_get_gpio_in(gic, i); s->rvic[n][i] = qdev_get_gpio_in(gic, i);
} }
} }
qdev_init_gpio_in(&dev->qdev, mpcore_rirq_set_irq, 64); qdev_init_gpio_in(dev, mpcore_rirq_set_irq, 64);
sysbus_init_mmio(dev, sysbus_mmio_get_region(s->priv, 0)); sysbus_init_mmio(sbd, sysbus_mmio_get_region(s->priv, 0));
return 0; return 0;
} }
@ -240,7 +246,7 @@ static void mpcore_rirq_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo mpcore_rirq_info = { static const TypeInfo mpcore_rirq_info = {
.name = "realview_mpcore", .name = TYPE_REALVIEW_MPCORE_RIRQ,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(mpcore_rirq_state), .instance_size = sizeof(mpcore_rirq_state),
.class_init = mpcore_rirq_class_init, .class_init = mpcore_rirq_class_init,