Le 31/05/2023 à 14:53, Mark Cave-Ayland a écrit :
> Also change the instantiation of the VIA1 device to use object_initialize_child().
>
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
> hw/m68k/q800.c | 16 +++++++++-------
> include/hw/m68k/q800.h | 2 ++
> 2 files changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
> index 785a67b0a9..65947ba580 100644
> --- a/hw/m68k/q800.c
> +++ b/hw/m68k/q800.c
> @@ -212,7 +212,7 @@ static void q800_machine_init(MachineState *machine)
> hwaddr parameters_base;
> CPUState *cs;
> DeviceState *dev;
> - DeviceState *via1_dev, *via2_dev;
> + DeviceState *via2_dev;
> DeviceState *escc_orgate;
> SysBusESPState *sysbus_esp;
> ESPState *esp;
> @@ -261,23 +261,25 @@ static void q800_machine_init(MachineState *machine)
> sysbus_realize(SYS_BUS_DEVICE(&m->glue), &error_fatal);
>
> /* VIA 1 */
> - via1_dev = qdev_new(TYPE_MOS6522_Q800_VIA1);
> + object_initialize_child(OBJECT(machine), "via1", &m->via1,
> + TYPE_MOS6522_Q800_VIA1);
> dinfo = drive_get(IF_MTD, 0, 0);
> if (dinfo) {
> - qdev_prop_set_drive(via1_dev, "drive", blk_by_legacy_dinfo(dinfo));
> + qdev_prop_set_drive(DEVICE(&m->via1), "drive",
> + blk_by_legacy_dinfo(dinfo));
> }
> - sysbus = SYS_BUS_DEVICE(via1_dev);
> - sysbus_realize_and_unref(sysbus, &error_fatal);
> + sysbus = SYS_BUS_DEVICE(&m->via1);
> + sysbus_realize(sysbus, &error_fatal);
> memory_region_add_subregion(&m->macio, VIA_BASE - IO_BASE,
> sysbus_mmio_get_region(sysbus, 1));
> sysbus_connect_irq(sysbus, 0,
> qdev_get_gpio_in(DEVICE(&m->glue), GLUE_IRQ_IN_VIA1));
> /* A/UX mode */
> - qdev_connect_gpio_out(via1_dev, 0,
> + qdev_connect_gpio_out(DEVICE(&m->via1), 0,
> qdev_get_gpio_in_named(DEVICE(&m->glue),
> "auxmode", 0));
>
> - adb_bus = qdev_get_child_bus(via1_dev, "adb.0");
> + adb_bus = qdev_get_child_bus(DEVICE(&m->via1), "adb.0");
> dev = qdev_new(TYPE_ADB_KEYBOARD);
> qdev_realize_and_unref(dev, adb_bus, &error_fatal);
> dev = qdev_new(TYPE_ADB_MOUSE);
> diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
> index 81598af627..a7e03b3d28 100644
> --- a/include/hw/m68k/q800.h
> +++ b/include/hw/m68k/q800.h
> @@ -24,6 +24,7 @@
> #define HW_Q800_H
>
> #include "hw/m68k/q800-glue.h"
> +#include "hw/misc/mac_via.h"
>
> /*
> * The main Q800 machine
> @@ -35,6 +36,7 @@ struct Q800MachineState {
> M68kCPU cpu;
> MemoryRegion rom;
> GLUEState glue;
> + MOS6522Q800VIA1State via1;
> MemoryRegion macio;
> MemoryRegion macio_alias;
> };
Reviewed-by: Laurent Vivier <laurent@vivier.eu>