[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 18/20] q800: add ESCC alias at 0xc000
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v3 18/20] q800: add ESCC alias at 0xc000 |
Date: |
Fri, 29 Sep 2023 18:59:15 +0100 |
Tests on real Q800 hardware show that the ESCC is addressable at multiple
locations
within the ESCC memory region - at least 0xc000, 0xc020 (as expected by the
MacOS
toolbox ROM) and 0xc040.
All released NetBSD kernels before 10 use the 0xc000 address which causes a
fatal
error when running the MacOS booter. Add a single memory region alias at 0xc000
to enable NetBSD kernels to start booting under QEMU.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
hw/m68k/q800.c | 6 ++++++
include/hw/m68k/q800.h | 1 +
2 files changed, 7 insertions(+)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 5ae7c37760..b5b2cabc33 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -451,6 +451,12 @@ static void q800_machine_init(MachineState *machine)
memory_region_add_subregion(&m->macio, SCC_BASE - IO_BASE,
sysbus_mmio_get_region(sysbus, 0));
+ /* Create alias for NetBSD */
+ memory_region_init_alias(&m->escc_alias, OBJECT(machine), "escc-alias",
+ sysbus_mmio_get_region(sysbus, 0), 0, 0x8);
+ memory_region_add_subregion(&m->macio, SCC_BASE - IO_BASE - 0x20,
+ &m->escc_alias);
+
/* SCSI */
object_initialize_child(OBJECT(machine), "esp", &m->esp,
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index fbaacd88bd..348eaf4703 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -67,6 +67,7 @@ struct Q800MachineState {
MemoryRegion macio;
MemoryRegion macio_alias;
MemoryRegion machine_id;
+ MemoryRegion escc_alias;
};
#define TYPE_Q800_MACHINE MACHINE_TYPE_NAME("q800")
--
2.39.2
- [PATCH v3 06/20] q800: allow accesses to RAM area even if less memory is available, (continued)
- [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, 2023/09/29
- [PATCH v3 18/20] q800: add ESCC alias at 0xc000,
Mark Cave-Ayland <=
- [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