[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 20/20] q800: configure nubus available slots for Quadra 800
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 20/20] q800: configure nubus available slots for Quadra 800 |
Date: |
Wed, 15 Sep 2021 11:10:26 +0100 |
Slot 0x9 is reserved for use by the in-built framebuffer whilst only slots
0xc, 0xd and 0xe physically exist on the Quadra 800.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/m68k/q800.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index fbc45a301f..65c80421c6 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -78,6 +78,13 @@
#define MAC_CLOCK 3686418
+/*
+ * Slot 0x9 is reserved for use by the in-built framebuffer whilst only
+ * slots 0xc, 0xd and 0xe physically exist on the Quadra 800
+ */
+#define Q800_NUBUS_SLOTS_AVAILABLE ((1UL << 0x9) | (1UL << 0xc) | \
+ (1UL << 0xd) | (1UL << 0xe))
+
/*
* The GLUE (General Logic Unit) is an Apple custom integrated circuit chip
* that performs a variety of functions (RAM management, clock generation,
...).
@@ -392,6 +399,8 @@ static void q800_init(MachineState *machine)
/* NuBus */
dev = qdev_new(TYPE_MAC_NUBUS_BRIDGE);
+ qdev_prop_set_uint32(dev, "slot-available-mask",
+ Q800_NUBUS_SLOTS_AVAILABLE);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 9 * NUBUS_SUPER_SLOT_SIZE);
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, NUBUS_SLOT_BASE +
--
2.20.1
- [PATCH v2 10/20] nubus-device: remove nubus_register_rom() and nubus_register_format_block(), (continued)
- [PATCH v2 10/20] nubus-device: remove nubus_register_rom() and nubus_register_format_block(), Mark Cave-Ayland, 2021/09/15
- [PATCH v2 11/20] nubus-device: add romfile property for loading declaration ROMs, Mark Cave-Ayland, 2021/09/15
- [PATCH v2 12/20] nubus: move nubus to its own 32-bit address space, Mark Cave-Ayland, 2021/09/15
- [PATCH v2 13/20] nubus-bridge: introduce separate NubusBridge structure, Mark Cave-Ayland, 2021/09/15
- [PATCH v2 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge, Mark Cave-Ayland, 2021/09/15
- [PATCH v2 15/20] nubus: move NubusBus from mac-nubus-bridge to nubus-bridge, Mark Cave-Ayland, 2021/09/15
- [PATCH v2 17/20] nubus-bridge: make slot_available_mask a qdev property, Mark Cave-Ayland, 2021/09/15
- [PATCH v2 18/20] nubus: add support for slot IRQs, Mark Cave-Ayland, 2021/09/15
- [PATCH v2 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge, Mark Cave-Ayland, 2021/09/15
- [PATCH v2 19/20] q800: wire up nubus IRQs, Mark Cave-Ayland, 2021/09/15
- [PATCH v2 20/20] q800: configure nubus available slots for Quadra 800,
Mark Cave-Ayland <=