diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2021-08-30 11:24:38 +0100 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2021-09-08 15:37:40 +0200 |
| commit | 8064d7bb54cf4e4b7bacb2020bbe2e2132aa7407 (patch) | |
| tree | 5271eeb8809813c0c2bb366b21e6f413d7f63a60 /include/hw/misc | |
| parent | ae6f236f4fcb61eb0e3761bab034cd562accf509 (diff) | |
| download | qemu-8064d7bb54cf4e4b7bacb2020bbe2e2132aa7407.zip qemu-8064d7bb54cf4e4b7bacb2020bbe2e2132aa7407.tar.gz qemu-8064d7bb54cf4e4b7bacb2020bbe2e2132aa7407.tar.bz2 | |
mac_via: move PRAM contents and block backend to MOS6522Q800VIA1State
The PRAM contents are 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>
Message-Id: <20210830102447.10806-4-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'include/hw/misc')
| -rw-r--r-- | include/hw/misc/mac_via.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h index 3058b30..bd1c65d 100644 --- a/include/hw/misc/mac_via.h +++ b/include/hw/misc/mac_via.h @@ -40,7 +40,11 @@ struct MOS6522Q800VIA1State { qemu_irq irqs[VIA1_IRQ_NB]; uint8_t last_b; + + /* RTC */ uint8_t PRAM[256]; + BlockBackend *blk; + VMChangeStateEntry *vmstate; /* external timers */ QEMUTimer *one_second_timer; @@ -80,8 +84,6 @@ OBJECT_DECLARE_SIMPLE_TYPE(MacVIAState, MAC_VIA) struct MacVIAState { SysBusDevice busdev; - VMChangeStateEntry *vmstate; - /* MMIO */ MemoryRegion mmio; MemoryRegion via1mem; @@ -101,7 +103,6 @@ struct MacVIAState { uint8_t cmd; int wprotect; int alt; - BlockBackend *blk; /* ADB */ ADBBusState adb_bus; |