diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2023-06-21 09:53:49 +0100 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2023-06-22 09:29:04 +0200 |
| commit | 36df1c5a635c11e5514ac561ed90a9c459cdbff2 (patch) | |
| tree | 615fc9ae98323928d8c6aad3c7b3fcfb79cab9f5 /include | |
| parent | 01f35a4f1cfa34a998d0bc11dbdefa7dd26d2c7b (diff) | |
| download | qemu-36df1c5a635c11e5514ac561ed90a9c459cdbff2.zip qemu-36df1c5a635c11e5514ac561ed90a9c459cdbff2.tar.gz qemu-36df1c5a635c11e5514ac561ed90a9c459cdbff2.tar.bz2 | |
q800: move mac-nubus-bridge device to Q800MachineState
Also change the instantiation of the mac-nubus-bridge device to use
object_initialize_child() and map the Nubus address space using
memory_region_add_subregion() instead of sysbus_mmio_map().
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230621085353.113233-21-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/m68k/q800.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h index 06e095a..8f2c572 100644 --- a/include/hw/m68k/q800.h +++ b/include/hw/m68k/q800.h @@ -34,6 +34,7 @@ #include "hw/or-irq.h" #include "hw/scsi/esp.h" #include "hw/block/swim.h" +#include "hw/nubus/mac-nubus-bridge.h" /* * The main Q800 machine @@ -52,6 +53,7 @@ struct Q800MachineState { OrIRQState escc_orgate; SysBusESPState esp; Swim swim; + MacNubusBridge mac_nubus_bridge; MemoryRegion macio; MemoryRegion macio_alias; }; |