[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/20] q800: add ESCC alias at 0xc000
From: |
Laurent Vivier |
Subject: |
[PULL 18/20] q800: add ESCC alias at 0xc000 |
Date: |
Sun, 8 Oct 2023 08:23:47 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
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>
Message-ID: <20231004083806.757242-19-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
include/hw/m68k/q800.h | 1 +
hw/m68k/q800.c | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index fbaacd88bd57..348eaf4703d0 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")
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index ac3115d32844..27a0b3c08a98 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,
--
2.41.0
- [PULL 03/20] q800: add machine id register, (continued)
- [PULL 03/20] q800: add machine id register, Laurent Vivier, 2023/10/08
- [PULL 07/20] audio: add Apple Sound Chip (ASC) emulation, Laurent Vivier, 2023/10/08
- [PULL 09/20] q800: add Apple Sound Chip (ASC) audio to machine, Laurent Vivier, 2023/10/08
- [PULL 10/20] q800: add easc bool machine class property to switch between ASC and EASC, Laurent Vivier, 2023/10/08
- [PULL 11/20] swim: add trace events for IWM and ISM registers, Laurent Vivier, 2023/10/08
- [PULL 12/20] swim: split into separate IWM and ISM register blocks, Laurent Vivier, 2023/10/08
- [PULL 13/20] swim: update IWM/ISM register block decoding, Laurent Vivier, 2023/10/08
- [PULL 14/20] mac_via: work around underflow in TimeDBRA timing loop in SETUPTIMEK, Laurent Vivier, 2023/10/08
- [PULL 15/20] mac_via: workaround NetBSD ADB bus enumeration issue, Laurent Vivier, 2023/10/08
- [PULL 16/20] mac_via: implement ADB_STATE_IDLE state if shift register in input mode, Laurent Vivier, 2023/10/08
- [PULL 18/20] q800: add ESCC alias at 0xc000,
Laurent Vivier <=
- [PULL 17/20] mac_via: always clear ADB interrupt when switching to A/UX mode, Laurent Vivier, 2023/10/08
- [PULL 20/20] mac_via: extend timer calibration hack to work with A/UX, Laurent Vivier, 2023/10/08
- [PULL 19/20] q800: add alias for MacOS toolbox ROM at 0x40000000, Laurent Vivier, 2023/10/08
- Re: [PULL 00/20] Q800 for 8.2 patches, Stefan Hajnoczi, 2023/10/09