[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 27/30] q800: add ESCC alias at 0xc000
From: |
Mark Cave-Ayland |
Subject: |
[PATCH 27/30] q800: add ESCC alias at 0xc000 |
Date: |
Wed, 24 May 2023 22:11:01 +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>
---
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 1af1a06f64..3acdb5dd8d 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -682,6 +682,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, NULL, "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 */
dev = qdev_new(TYPE_SYSBUS_ESP);
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 0144be5e6e..3039b24d30 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -40,6 +40,7 @@ struct Q800MachineState {
MemoryRegion macio;
MemoryRegion macio_alias;
MemoryRegion machine_id;
+ MemoryRegion escc_alias;
};
#define TYPE_Q800_MACHINE MACHINE_TYPE_NAME("q800")
--
2.30.2
- [PATCH 18/30] swim: add trace events for IWM and ISM registers, (continued)
- [PATCH 18/30] swim: add trace events for IWM and ISM registers, Mark Cave-Ayland, 2023/05/24
- [PATCH 22/30] mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf, Mark Cave-Ayland, 2023/05/24
- [PATCH 21/30] mac_via: work around underflow in TimeDBRA timing loop in SETUPTIMEK, Mark Cave-Ayland, 2023/05/24
- [PATCH 23/30] mac_via: fix rtc command decoding for the PRAM seconds registers, Mark Cave-Ayland, 2023/05/24
- [PATCH 20/30] swim: update IWM/ISM register block decoding, Mark Cave-Ayland, 2023/05/24
- [PATCH 24/30] mac_via: workaround NetBSD ADB bus enumeration issue, Mark Cave-Ayland, 2023/05/24
- [PATCH 25/30] mac_via: implement ADB_STATE_IDLE state if shift register in input mode, Mark Cave-Ayland, 2023/05/24
- [PATCH 16/30] q800: add Apple Sound Chip (ASC) audio to machine, Mark Cave-Ayland, 2023/05/24
- [PATCH 27/30] q800: add ESCC alias at 0xc000,
Mark Cave-Ayland <=
- [PATCH 28/30] q800: add alias for MacOS toolbox ROM at 0x40000000, Mark Cave-Ayland, 2023/05/24
- [PATCH 26/30] mac_via: always clear ADB interrupt when switching to A/UX mode, Mark Cave-Ayland, 2023/05/24
- [PATCH 29/30] mac_via: extend timer calibration hack to work with A/UX, Mark Cave-Ayland, 2023/05/24
- [PATCH 30/30] mac_via: work around QEMU unaligned MMIO access bug, Mark Cave-Ayland, 2023/05/24