[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 20/24] q800: move mac-nubus-bridge device to Q800MachineState
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v4 20/24] q800: move mac-nubus-bridge device to Q800MachineState |
Date: |
Wed, 21 Jun 2023 09:53:49 +0100 |
Also change the instantiation of the mac-nubus-bridge device to use
object_initialize_child() and map the Nubus address space using
memory_region_add_subregion() instead of sysbus_mmio_map().
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/m68k/q800.c | 21 ++++++++++++++-------
include/hw/m68k/q800.h | 2 ++
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 50fc7de9a2..b22651931a 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -415,14 +415,21 @@ static void q800_machine_init(MachineState *machine)
/* NuBus */
- dev = qdev_new(TYPE_MAC_NUBUS_BRIDGE);
- qdev_prop_set_uint32(dev, "slot-available-mask",
+ object_initialize_child(OBJECT(machine), "mac-nubus-bridge",
+ &m->mac_nubus_bridge,
+ TYPE_MAC_NUBUS_BRIDGE);
+ sysbus = SYS_BUS_DEVICE(&m->mac_nubus_bridge);
+ dev = DEVICE(&m->mac_nubus_bridge);
+ qdev_prop_set_uint32(DEVICE(&m->mac_nubus_bridge), "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,
- MAC_NUBUS_FIRST_SLOT * NUBUS_SUPER_SLOT_SIZE);
- sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, NUBUS_SLOT_BASE +
- MAC_NUBUS_FIRST_SLOT * NUBUS_SLOT_SIZE);
+ sysbus_realize(sysbus, &error_fatal);
+ memory_region_add_subregion(get_system_memory(),
+ MAC_NUBUS_FIRST_SLOT * NUBUS_SUPER_SLOT_SIZE,
+ sysbus_mmio_get_region(sysbus, 0));
+ memory_region_add_subregion(get_system_memory(),
+ NUBUS_SLOT_BASE +
+ MAC_NUBUS_FIRST_SLOT * NUBUS_SLOT_SIZE,
+ sysbus_mmio_get_region(sysbus, 1));
qdev_connect_gpio_out(dev, 9,
qdev_get_gpio_in_named(DEVICE(&m->via2), "nubus-irq",
VIA2_NUBUS_IRQ_INTVIDEO));
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 06e095ae29..8f2c572a81 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -34,6 +34,7 @@
#include "hw/or-irq.h"
#include "hw/scsi/esp.h"
#include "hw/block/swim.h"
+#include "hw/nubus/mac-nubus-bridge.h"
/*
* The main Q800 machine
@@ -52,6 +53,7 @@ struct Q800MachineState {
OrIRQState escc_orgate;
SysBusESPState esp;
Swim swim;
+ MacNubusBridge mac_nubus_bridge;
MemoryRegion macio;
MemoryRegion macio_alias;
};
--
2.30.2
- [PATCH v4 10/24] q800: introduce mac-io container memory region, (continued)
- [PATCH v4 10/24] q800: introduce mac-io container memory region, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 11/24] q800: reimplement mac-io region aliasing using IO memory region, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 12/24] q800: move VIA1 device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 13/24] q800: move VIA2 device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 14/24] hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 15/24] q800: move dp8393x device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 16/24] q800: move ESCC device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 18/24] q800: move ESP device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 17/24] q800: move escc_orgate device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 19/24] q800: move SWIM device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 20/24] q800: move mac-nubus-bridge device to Q800MachineState,
Mark Cave-Ayland <=
- [PATCH v4 21/24] q800: don't access Nubus bus directly from the mac-nubus-bridge device, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 22/24] q800: move macfb device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 24/24] mac_via: fix rtc command decoding for the PRAM seconds registers, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 23/24] mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf, Mark Cave-Ayland, 2023/06/21
- Re: [PATCH v4 00/24] q800: add support for booting MacOS Classic - part 1, Philippe Mathieu-Daudé, 2023/06/21
- Re: [PATCH v4 00/24] q800: add support for booting MacOS Classic - part 1, Laurent Vivier, 2023/06/22