diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2021-08-30 11:24:39 +0100 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2021-09-08 15:37:40 +0200 |
| commit | 741258b06cd5fa834fc826c8f308fc18fe1dab35 (patch) | |
| tree | 35952a0b2e68b81c5317a06dfffd3222d18b39b6 /include | |
| parent | 8064d7bb54cf4e4b7bacb2020bbe2e2132aa7407 (diff) | |
| download | qemu-741258b06cd5fa834fc826c8f308fc18fe1dab35.zip qemu-741258b06cd5fa834fc826c8f308fc18fe1dab35.tar.gz qemu-741258b06cd5fa834fc826c8f308fc18fe1dab35.tar.bz2 | |
mac_via: move PRAM/RTC variables to MOS6522Q800VIA1State
The PRAM/RTC 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-5-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/misc/mac_via.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h index bd1c65d..b2c499e 100644 --- a/include/hw/misc/mac_via.h +++ b/include/hw/misc/mac_via.h @@ -46,6 +46,16 @@ struct MOS6522Q800VIA1State { BlockBackend *blk; VMChangeStateEntry *vmstate; + uint32_t tick_offset; + + uint8_t data_out; + int data_out_cnt; + uint8_t data_in; + uint8_t data_in_cnt; + uint8_t cmd; + int wprotect; + int alt; + /* external timers */ QEMUTimer *one_second_timer; int64_t next_second; @@ -93,17 +103,6 @@ struct MacVIAState { MOS6522Q800VIA1State mos6522_via1; MOS6522Q800VIA2State mos6522_via2; - /* RTC */ - uint32_t tick_offset; - - uint8_t data_out; - int data_out_cnt; - uint8_t data_in; - uint8_t data_in_cnt; - uint8_t cmd; - int wprotect; - int alt; - /* ADB */ ADBBusState adb_bus; qemu_irq adb_data_ready; |