[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 23/24] mac_via: fix rtc command decoding from PRAM addresses 0
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v4 23/24] mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf |
Date: |
Wed, 21 Jun 2023 09:53:52 +0100 |
A comparison between the rtc command table included in the comment and the code
itself shows that the decoding for PRAM addresses 0x0 to 0xf is being done on
the raw command, and not the shifted version held in value.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
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 076d18e5fd..85c2e65856 100644
--- a/hw/misc/mac_via.c
+++ b/hw/misc/mac_via.c
@@ -399,7 +399,7 @@ static int via1_rtc_compact_cmd(uint8_t value)
} else if ((value & 0x1c) == 0x08) {
/* RAM address 0x10 to 0x13 */
return read | (REG_PRAM_ADDR + 0x10 + (value & 0x03));
- } else if ((value & 0x43) == 0x41) {
+ } else if ((value & 0x10) == 0x10) {
/* RAM address 0x00 to 0x0f */
return read | (REG_PRAM_ADDR + (value & 0x0f));
}
--
2.30.2
- [PATCH v4 14/24] hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h, (continued)
- [PATCH v4 14/24] hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 15/24] q800: move dp8393x device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 16/24] q800: move ESCC device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 18/24] q800: move ESP device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 17/24] q800: move escc_orgate device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 19/24] q800: move SWIM device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 20/24] q800: move mac-nubus-bridge device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 21/24] q800: don't access Nubus bus directly from the mac-nubus-bridge device, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 22/24] q800: move macfb device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 24/24] mac_via: fix rtc command decoding for the PRAM seconds registers, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 23/24] mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf,
Mark Cave-Ayland <=
- Re: [PATCH v4 00/24] q800: add support for booting MacOS Classic - part 1, Philippe Mathieu-Daudé, 2023/06/21
- Re: [PATCH v4 00/24] q800: add support for booting MacOS Classic - part 1, Laurent Vivier, 2023/06/22