[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 17/20] mac_via: always clear ADB interrupt when switching to A
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v3 17/20] mac_via: always clear ADB interrupt when switching to A/UX mode |
Date: |
Fri, 29 Sep 2023 18:59:14 +0100 |
When the NetBSD kernel initialises it can leave the ADB interrupt asserted
depending upon where in the ADB poll cycle the MacOS ADB interrupt handler
is when the NetBSD kernel disables interrupts.
The NetBSD ADB driver uses the ADB interrupt state to determine if the ADB
is busy and refuses to send ADB commands unless it is clear. To ensure that
this doesn't happen, always clear the ADB interrupt when switching to A/UX
mode to ensure that the bus enumeration always occurs.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
hw/misc/mac_via.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c
index 3c41d6263d..500ece5872 100644
--- a/hw/misc/mac_via.c
+++ b/hw/misc/mac_via.c
@@ -875,6 +875,15 @@ static void via1_auxmode_update(MOS6522Q800VIA1State *v1s)
if (irq != oldirq) {
trace_via1_auxmode(irq);
qemu_set_irq(v1s->auxmode_irq, irq);
+
+ /*
+ * Clear the ADB interrupt. MacOS can leave VIA1B_vADBInt asserted
+ * (low) if a poll sequence doesn't complete before NetBSD disables
+ * interrupts upon boot. Fortunately NetBSD switches to the so-called
+ * "A/UX" interrupt mode after it initialises, so we can use this as
+ * a convenient place to clear the ADB interrupt for now.
+ */
+ s->b |= VIA1B_vADBInt;
}
}
--
2.39.2
- [PATCH v3 05/20] q800: add IOSB subsystem, (continued)
- [PATCH v3 05/20] q800: add IOSB subsystem, Mark Cave-Ayland, 2023/09/29
- [PATCH v3 06/20] q800: allow accesses to RAM area even if less memory is available, Mark Cave-Ayland, 2023/09/29
- [PATCH v3 08/20] asc: generate silence if FIFO empty but engine still running, Mark Cave-Ayland, 2023/09/29
- [PATCH v3 07/20] audio: add Apple Sound Chip (ASC) emulation, Mark Cave-Ayland, 2023/09/29
- [PATCH v3 11/20] swim: add trace events for IWM and ISM registers, Mark Cave-Ayland, 2023/09/29
- [PATCH v3 09/20] q800: add Apple Sound Chip (ASC) audio to machine, Mark Cave-Ayland, 2023/09/29
- [PATCH v3 10/20] q800: add easc bool machine class property to switch between ASC and EASC, Mark Cave-Ayland, 2023/09/29
- [PATCH v3 12/20] swim: split into separate IWM and ISM register blocks, Mark Cave-Ayland, 2023/09/29
- [PATCH v3 14/20] mac_via: work around underflow in TimeDBRA timing loop in SETUPTIMEK, Mark Cave-Ayland, 2023/09/29
- [PATCH v3 13/20] swim: update IWM/ISM register block decoding, Mark Cave-Ayland, 2023/09/29
- [PATCH v3 17/20] mac_via: always clear ADB interrupt when switching to A/UX mode,
Mark Cave-Ayland <=
- [PATCH v3 18/20] q800: add ESCC alias at 0xc000, Mark Cave-Ayland, 2023/09/29
- [PATCH v3 19/20] q800: add alias for MacOS toolbox ROM at 0x40000000, Mark Cave-Ayland, 2023/09/29
- [PATCH v3 15/20] mac_via: workaround NetBSD ADB bus enumeration issue, Mark Cave-Ayland, 2023/09/29
- [PATCH v3 16/20] mac_via: implement ADB_STATE_IDLE state if shift register in input mode, Mark Cave-Ayland, 2023/09/29
- [PATCH v3 20/20] mac_via: extend timer calibration hack to work with A/UX, Mark Cave-Ayland, 2023/09/29