diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2024-12-22 12:59:44 +0000 |
|---|---|---|
| committer | Thomas Huth <huth@tuxfamily.org> | 2024-12-29 07:13:47 +0100 |
| commit | 9364f7b875ba6db906014b43cde0d9c80ba159d8 (patch) | |
| tree | d84878e5f6588e9e5c2eb55fd64b17aa4bcef0b1 /hw/m68k/next-cube.c | |
| parent | 1441b8f922579c470e11dd9922122025f1c8cab2 (diff) | |
| download | focaccia-qemu-9364f7b875ba6db906014b43cde0d9c80ba159d8.tar.gz focaccia-qemu-9364f7b875ba6db906014b43cde0d9c80ba159d8.zip | |
next-cube: introduce next_pc_init() object init function
Move initialisation of the memory regions and GPIOs from next_pc_realize() to the new next_pc_init() function. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Thomas Huth <huth@tuxfamily.org> Message-ID: <20241222130012.1013374-6-mark.cave-ayland@ilande.co.uk> Signed-off-by: Thomas Huth <huth@tuxfamily.org>
Diffstat (limited to 'hw/m68k/next-cube.c')
| -rw-r--r-- | hw/m68k/next-cube.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 97dea45b13..c187a469d9 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -897,20 +897,24 @@ static void next_pc_reset(DeviceState *dev) static void next_pc_realize(DeviceState *dev, Error **errp) { - NeXTPC *s = NEXT_PC(dev); - SysBusDevice *sbd = SYS_BUS_DEVICE(dev); + /* SCSI */ + next_scsi_init(dev); +} + +static void next_pc_init(Object *obj) +{ + NeXTPC *s = NEXT_PC(obj); + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); - qdev_init_gpio_in(dev, next_irq, NEXT_NUM_IRQS); + qdev_init_gpio_in(DEVICE(obj), next_irq, NEXT_NUM_IRQS); memory_region_init_io(&s->mmiomem, OBJECT(s), &next_mmio_ops, s, "next.mmio", 0x9000); memory_region_init_io(&s->scrmem, OBJECT(s), &next_scr_ops, s, "next.scr", 0x20000); + sysbus_init_mmio(sbd, &s->mmiomem); sysbus_init_mmio(sbd, &s->scrmem); - - /* SCSI */ - next_scsi_init(dev); } /* @@ -971,6 +975,7 @@ static void next_pc_class_init(ObjectClass *klass, void *data) static const TypeInfo next_pc_info = { .name = TYPE_NEXT_PC, .parent = TYPE_SYS_BUS_DEVICE, + .instance_init = next_pc_init, .instance_size = sizeof(NeXTPC), .class_init = next_pc_class_init, }; |