[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/12] mac_via: move last_b variable into q800 VIA1 VMStateDescri
From: |
Mark Cave-Ayland |
Subject: |
[PATCH 02/12] mac_via: move last_b variable into q800 VIA1 VMStateDescription |
Date: |
Mon, 30 Aug 2021 11:24:37 +0100 |
This variable is already present in MOS6522Q800VIA1State and can be moved
immediately into the q800 VIA1 VMStateDescription.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/misc/mac_via.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c
index 46e65058e0..6fb0b9391d 100644
--- a/hw/misc/mac_via.c
+++ b/hw/misc/mac_via.c
@@ -1083,7 +1083,6 @@ static const VMStateDescription vmstate_mac_via = {
.post_load = mac_via_post_load,
.fields = (VMStateField[]) {
/* VIAs */
- VMSTATE_UINT8(mos6522_via1.last_b, MacVIAState),
VMSTATE_BUFFER(mos6522_via1.PRAM, MacVIAState),
VMSTATE_TIMER_PTR(mos6522_via1.one_second_timer, MacVIAState),
VMSTATE_INT64(mos6522_via1.next_second, MacVIAState),
@@ -1159,6 +1158,7 @@ static const VMStateDescription vmstate_q800_via1 = {
.fields = (VMStateField[]) {
VMSTATE_STRUCT(parent_obj, MOS6522Q800VIA1State, 0, vmstate_mos6522,
MOS6522State),
+ VMSTATE_UINT8(last_b, MOS6522Q800VIA1State),
VMSTATE_END_OF_LIST()
}
};
--
2.20.1
- [PATCH 00/12] mac_via: remove MAC_VIA device and prepare for Nubus IRQs, Mark Cave-Ayland, 2021/08/30
- [PATCH 03/12] mac_via: move PRAM contents and block backend to MOS6522Q800VIA1State, Mark Cave-Ayland, 2021/08/30
- [PATCH 01/12] mac_via: introduce new VMStateDescription for q800 VIA1 and VIA2, Mark Cave-Ayland, 2021/08/30
- [PATCH 02/12] mac_via: move last_b variable into q800 VIA1 VMStateDescription,
Mark Cave-Ayland <=
- [PATCH 05/12] mac_via: move ADB variables to MOS6522Q800VIA1State, Mark Cave-Ayland, 2021/08/30
- [PATCH 06/12] mac_via: move q800 VIA1 timer variables to q800 VIA1 VMStateDescription, Mark Cave-Ayland, 2021/08/30
- [PATCH 07/12] mac_via: move VIA1 reset logic from mac_via_reset() to mos6522_q800_via1_reset(), Mark Cave-Ayland, 2021/08/30
- [PATCH 08/12] mac_via: move VIA1 realize logic from mac_via_realize() to mos6522_q800_via1_realize(), Mark Cave-Ayland, 2021/08/30
- [PATCH 09/12] mac_via: remove mac_via device, Mark Cave-Ayland, 2021/08/30
- [PATCH 04/12] mac_via: move PRAM/RTC variables to MOS6522Q800VIA1State, Mark Cave-Ayland, 2021/08/30
- [PATCH 10/12] mac_via: remove explicit viaN prefix from VIA IRQ gpios, Mark Cave-Ayland, 2021/08/30