[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 16/20] nubus-bridge: embed the NubusBus object directly within
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v4 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge |
Date: |
Fri, 17 Sep 2021 08:50:53 +0100 |
Since nubus-bridge is a container for NubusBus then it should be embedded
directly within the bridge device using qbus_create_inplace().
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/m68k/q800.c | 2 +-
hw/nubus/mac-nubus-bridge.c | 7 ++++---
hw/nubus/nubus-bridge.c | 3 ++-
include/hw/nubus/nubus.h | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 46befe0898..e34df1a829 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -397,7 +397,7 @@ static void q800_init(MachineState *machine)
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, NUBUS_SLOT_BASE +
9 * NUBUS_SLOT_SIZE);
- nubus = NUBUS_BRIDGE(dev)->bus;
+ nubus = &NUBUS_BRIDGE(dev)->bus;
/* framebuffer in nubus slot #9 */
diff --git a/hw/nubus/mac-nubus-bridge.c b/hw/nubus/mac-nubus-bridge.c
index 4854e7e546..f764b2f562 100644
--- a/hw/nubus/mac-nubus-bridge.c
+++ b/hw/nubus/mac-nubus-bridge.c
@@ -18,18 +18,19 @@ static void mac_nubus_bridge_init(Object *obj)
MacNubusBridge *s = MAC_NUBUS_BRIDGE(obj);
NubusBridge *nb = NUBUS_BRIDGE(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
+ NubusBus *bus = &nb->bus;
/* Macintosh only has slots 0x9 to 0xe available */
- nb->bus->slot_available_mask = MAKE_64BIT_MASK(9, 6);
+ bus->slot_available_mask = MAKE_64BIT_MASK(9, 6);
/* Aliases for slots 0x9 to 0xe */
memory_region_init_alias(&s->super_slot_alias, obj, "super-slot-alias",
- &nb->bus->nubus_mr,
+ &bus->nubus_mr,
9 * NUBUS_SUPER_SLOT_SIZE,
6 * NUBUS_SUPER_SLOT_SIZE);
memory_region_init_alias(&s->slot_alias, obj, "slot-alias",
- &nb->bus->nubus_mr,
+ &bus->nubus_mr,
NUBUS_SLOT_BASE + 9 * NUBUS_SLOT_SIZE,
6 * NUBUS_SLOT_SIZE);
diff --git a/hw/nubus/nubus-bridge.c b/hw/nubus/nubus-bridge.c
index 3b68d4435c..1adda7f5a6 100644
--- a/hw/nubus/nubus-bridge.c
+++ b/hw/nubus/nubus-bridge.c
@@ -16,8 +16,9 @@
static void nubus_bridge_init(Object *obj)
{
NubusBridge *s = NUBUS_BRIDGE(obj);
+ NubusBus *bus = &s->bus;
- s->bus = NUBUS_BUS(qbus_create(TYPE_NUBUS_BUS, DEVICE(s), NULL));
+ qbus_create_inplace(bus, sizeof(s->bus), TYPE_NUBUS_BUS, DEVICE(s), NULL);
}
static void nubus_bridge_class_init(ObjectClass *klass, void *data)
diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index 2c83e7f7b8..cf9a585a91 100644
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -62,7 +62,7 @@ struct NubusDevice {
struct NubusBridge {
SysBusDevice parent_obj;
- NubusBus *bus;
+ NubusBus bus;
};
#endif
--
2.20.1
- [PATCH v4 09/20] macfb: don't register declaration ROM, (continued)
[PATCH v4 13/20] nubus-bridge: introduce separate NubusBridge structure, Mark Cave-Ayland, 2021/09/17
[PATCH v4 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge, Mark Cave-Ayland, 2021/09/17
[PATCH v4 12/20] nubus: move nubus to its own 32-bit address space, Mark Cave-Ayland, 2021/09/17
[PATCH v4 15/20] nubus: move NubusBus from mac-nubus-bridge to nubus-bridge, Mark Cave-Ayland, 2021/09/17
[PATCH v4 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge,
Mark Cave-Ayland <=
[PATCH v4 17/20] nubus-bridge: make slot_available_mask a qdev property, Mark Cave-Ayland, 2021/09/17
[PATCH v4 18/20] nubus: add support for slot IRQs, Mark Cave-Ayland, 2021/09/17
[PATCH v4 19/20] q800: wire up nubus IRQs, Mark Cave-Ayland, 2021/09/17
[PATCH v4 20/20] q800: configure nubus available slots for Quadra 800, Mark Cave-Ayland, 2021/09/17