q800: move VIA1 device to Q800MachineState

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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20230621085353.113233-13-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Mark Cave-Ayland 2023-06-21 09:53:41 +01:00 committed by Laurent Vivier
parent f18a288632
commit 6d32c0643f
2 changed files with 11 additions and 7 deletions

View file

@ -28,6 +28,7 @@
#include "target/m68k/cpu-qom.h"
#include "exec/memory.h"
#include "hw/m68k/q800-glue.h"
#include "hw/misc/mac_via.h"
/*
* The main Q800 machine
@ -39,6 +40,7 @@ struct Q800MachineState {
M68kCPU cpu;
MemoryRegion rom;
GLUEState glue;
MOS6522Q800VIA1State via1;
MemoryRegion macio;
MemoryRegion macio_alias;
};