mirror of https://github.com/proxmox/mirror_qemu
hw/intc/pxa2xx: Factor pxa2xx_pic_realize() out of pxa2xx_pic_init()
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-id: 20231020130331.50048-9-philmd@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>master
parent
ee5c9b5b19
commit
25c4ff29d1
|
@ -287,12 +287,18 @@ static void pxa2xx_pic_reset_hold(Object *obj)
|
|||
DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu)
|
||||
{
|
||||
DeviceState *dev = qdev_new(TYPE_PXA2XX_PIC);
|
||||
PXA2xxPICState *s = PXA2XX_PIC(dev);
|
||||
|
||||
object_property_set_link(OBJECT(dev), "arm-cpu",
|
||||
OBJECT(cpu), &error_abort);
|
||||
|
||||
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
||||
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
|
||||
|
||||
return dev;
|
||||
}
|
||||
|
||||
static void pxa2xx_pic_realize(DeviceState *dev, Error **errp)
|
||||
{
|
||||
PXA2xxPICState *s = PXA2XX_PIC(dev);
|
||||
|
||||
qdev_init_gpio_in(dev, pxa2xx_pic_set_irq, PXA2XX_PIC_SRCS);
|
||||
|
||||
|
@ -300,12 +306,9 @@ DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu)
|
|||
memory_region_init_io(&s->iomem, OBJECT(s), &pxa2xx_pic_ops, s,
|
||||
"pxa2xx-pic", 0x00100000);
|
||||
sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem);
|
||||
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
|
||||
|
||||
/* Enable IC coprocessor access. */
|
||||
define_arm_cp_regs_with_opaque(cpu, pxa_pic_cp_reginfo, s);
|
||||
|
||||
return dev;
|
||||
define_arm_cp_regs_with_opaque(s->cpu, pxa_pic_cp_reginfo, s);
|
||||
}
|
||||
|
||||
static const VMStateDescription vmstate_pxa2xx_pic_regs = {
|
||||
|
@ -335,6 +338,7 @@ static void pxa2xx_pic_class_init(ObjectClass *klass, void *data)
|
|||
ResettableClass *rc = RESETTABLE_CLASS(klass);
|
||||
|
||||
device_class_set_props(dc, pxa2xx_pic_properties);
|
||||
dc->realize = pxa2xx_pic_realize;
|
||||
dc->desc = "PXA2xx PIC";
|
||||
dc->vmsd = &vmstate_pxa2xx_pic_regs;
|
||||
rc->phases.hold = pxa2xx_pic_reset_hold;
|
||||
|
|
Loading…
Reference in New Issue