diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2023-06-21 09:53:45 +0100 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2023-06-22 09:26:47 +0200 |
| commit | 836126c77326d9a7b629063c9caa9deff3a26aed (patch) | |
| tree | 734c7ccee7363693dfc95898b68ee4a0562f042a /include | |
| parent | 804ae67ee6fc3ff5a6c82edba7ed4cbdd33de091 (diff) | |
| download | qemu-836126c77326d9a7b629063c9caa9deff3a26aed.zip qemu-836126c77326d9a7b629063c9caa9deff3a26aed.tar.gz qemu-836126c77326d9a7b629063c9caa9deff3a26aed.tar.bz2 | |
q800: move ESCC device to Q800MachineState
Also change the instantiation of the ESCC device to use object_initialize_child().
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20230621085353.113233-17-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 d11bc02..9e76a3f 100644 --- a/include/hw/m68k/q800.h +++ b/include/hw/m68k/q800.h @@ -30,6 +30,7 @@ #include "hw/m68k/q800-glue.h" #include "hw/misc/mac_via.h" #include "hw/net/dp8393x.h" +#include "hw/char/escc.h" /* * The main Q800 machine @@ -44,6 +45,7 @@ struct Q800MachineState { MOS6522Q800VIA1State via1; MOS6522Q800VIA2State via2; dp8393xState dp8393x; + ESCCState escc; MemoryRegion macio; MemoryRegion macio_alias; }; |