diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2021-08-30 11:24:40 +0100 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2021-09-08 15:37:40 +0200 |
| commit | 5f083d4224d8927b1ce9b0f6d0eaf661c9bd5d51 (patch) | |
| tree | d3e6460ec3ac28801813061b83edadb300dcd7d1 /hw/m68k/q800.c | |
| parent | 741258b06cd5fa834fc826c8f308fc18fe1dab35 (diff) | |
| download | qemu-5f083d4224d8927b1ce9b0f6d0eaf661c9bd5d51.zip qemu-5f083d4224d8927b1ce9b0f6d0eaf661c9bd5d51.tar.gz qemu-5f083d4224d8927b1ce9b0f6d0eaf661c9bd5d51.tar.bz2 | |
mac_via: move ADB variables to MOS6522Q800VIA1State
The ADB is accessed using clock and data pins on q800 VIA1 port B and so can be
moved to MOS6522Q800VIA1State.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210830102447.10806-6-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'hw/m68k/q800.c')
| -rw-r--r-- | hw/m68k/q800.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index ac0a130..e14f68f 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -225,7 +225,7 @@ static void q800_init(MachineState *machine) hwaddr parameters_base; CPUState *cs; DeviceState *dev; - DeviceState *via_dev; + DeviceState *via_dev, *via1_dev; DeviceState *escc_orgate; SysBusESPState *sysbus_esp; ESPState *esp; @@ -285,8 +285,8 @@ static void q800_init(MachineState *machine) qdev_connect_gpio_out_named(DEVICE(sysbus), "irq", 1, qdev_get_gpio_in(glue, 1)); - - adb_bus = qdev_get_child_bus(via_dev, "adb.0"); + via1_dev = DEVICE(MOS6522_Q800_VIA1(&MAC_VIA(via_dev)->mos6522_via1)); + adb_bus = qdev_get_child_bus(DEVICE(via1_dev), "adb.0"); dev = qdev_new(TYPE_ADB_KEYBOARD); qdev_realize_and_unref(dev, adb_bus, &error_fatal); dev = qdev_new(TYPE_ADB_MOUSE); |