[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/12] mac_via: move q800 VIA1 timer variables to q800 VIA1 VMStat
From: |
Laurent Vivier |
Subject: |
[PULL 06/12] mac_via: move q800 VIA1 timer variables to q800 VIA1 VMStateDescription |
Date: |
Wed, 8 Sep 2021 17:35:23 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
These variables are already present in MOS6522Q800VIA1State and so it is just
the VMStateDescription move that is needed.
With this change the mac_via VMStateDescription is now empty and can be removed
completely.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210830102447.10806-7-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/misc/mac_via.c | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c
index b4a65480fdc8..47e221dd88cf 100644
--- a/hw/misc/mac_via.c
+++ b/hw/misc/mac_via.c
@@ -1067,27 +1067,12 @@ static int via1_post_load(void *opaque, int version_id)
return 0;
}
-static const VMStateDescription vmstate_mac_via = {
- .name = "mac-via",
- .version_id = 2,
- .minimum_version_id = 2,
- .fields = (VMStateField[]) {
- /* VIAs */
- VMSTATE_TIMER_PTR(mos6522_via1.one_second_timer, MacVIAState),
- VMSTATE_INT64(mos6522_via1.next_second, MacVIAState),
- VMSTATE_TIMER_PTR(mos6522_via1.sixty_hz_timer, MacVIAState),
- VMSTATE_INT64(mos6522_via1.next_sixty_hz, MacVIAState),
- VMSTATE_END_OF_LIST()
- }
-};
-
static void mac_via_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
dc->realize = mac_via_realize;
dc->reset = mac_via_reset;
- dc->vmsd = &vmstate_mac_via;
}
static TypeInfo mac_via_info = {
@@ -1150,6 +1135,11 @@ static const VMStateDescription vmstate_q800_via1 = {
VMSTATE_BUFFER(adb_data_in, MOS6522Q800VIA1State),
VMSTATE_BUFFER(adb_data_out, MOS6522Q800VIA1State),
VMSTATE_UINT8(adb_autopoll_cmd, MOS6522Q800VIA1State),
+ /* Timers */
+ VMSTATE_TIMER_PTR(one_second_timer, MOS6522Q800VIA1State),
+ VMSTATE_INT64(next_second, MOS6522Q800VIA1State),
+ VMSTATE_TIMER_PTR(sixty_hz_timer, MOS6522Q800VIA1State),
+ VMSTATE_INT64(next_sixty_hz, MOS6522Q800VIA1State),
VMSTATE_END_OF_LIST()
}
};
--
2.31.1
- [PULL 00/12] Q800 patches, Laurent Vivier, 2021/09/08
- [PULL 01/12] mac_via: introduce new VMStateDescription for q800 VIA1 and VIA2, Laurent Vivier, 2021/09/08
- [PULL 02/12] mac_via: move last_b variable into q800 VIA1 VMStateDescription, Laurent Vivier, 2021/09/08
- [PULL 03/12] mac_via: move PRAM contents and block backend to MOS6522Q800VIA1State, Laurent Vivier, 2021/09/08
- [PULL 06/12] mac_via: move q800 VIA1 timer variables to q800 VIA1 VMStateDescription,
Laurent Vivier <=
- [PULL 08/12] mac_via: move VIA1 realize logic from mac_via_realize() to mos6522_q800_via1_realize(), Laurent Vivier, 2021/09/08
- [PULL 11/12] mac_via: rename VIA2_IRQ_SLOT_BIT to VIA2_IRQ_NUBUS_BIT, Laurent Vivier, 2021/09/08
- [PULL 12/12] mac_via: add qdev gpios for nubus slot interrupts to VIA2, Laurent Vivier, 2021/09/08
- [PULL 09/12] mac_via: remove mac_via device, Laurent Vivier, 2021/09/08
- [PULL 04/12] mac_via: move PRAM/RTC variables to MOS6522Q800VIA1State, Laurent Vivier, 2021/09/08
- [PULL 05/12] mac_via: move ADB variables to MOS6522Q800VIA1State, Laurent Vivier, 2021/09/08
- [PULL 10/12] mac_via: remove explicit viaN prefix from VIA IRQ gpios, Laurent Vivier, 2021/09/08
- [PULL 07/12] mac_via: move VIA1 reset logic from mac_via_reset() to mos6522_q800_via1_reset(), Laurent Vivier, 2021/09/08
- Re: [PULL 00/12] Q800 patches, Peter Maydell, 2021/09/10