[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/20] nubus-bridge: embed the NubusBus object directly within nub
From: |
Laurent Vivier |
Subject: |
[PULL 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge |
Date: |
Wed, 29 Sep 2021 11:28:39 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
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>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210924073808.1041-17-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
include/hw/nubus/nubus.h | 2 +-
hw/m68k/q800.c | 2 +-
hw/nubus/mac-nubus-bridge.c | 9 +++++----
hw/nubus/nubus-bridge.c | 3 ++-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index 2d00d1815060..63c69a7586fc 100644
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -63,7 +63,7 @@ struct NubusDevice {
struct NubusBridge {
SysBusDevice parent_obj;
- NubusBus *bus;
+ NubusBus bus;
};
#endif
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 9bdea1a36297..074acf4fdc75 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -398,7 +398,7 @@ static void q800_init(MachineState *machine)
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, NUBUS_SLOT_BASE +
MAC_NUBUS_FIRST_SLOT * 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 db8640eed262..a0da5a8b2faf 100644
--- a/hw/nubus/mac-nubus-bridge.c
+++ b/hw/nubus/mac-nubus-bridge.c
@@ -18,19 +18,20 @@ 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(MAC_NUBUS_FIRST_SLOT,
- MAC_NUBUS_SLOT_NB);
+ bus->slot_available_mask = MAKE_64BIT_MASK(MAC_NUBUS_FIRST_SLOT,
+ MAC_NUBUS_SLOT_NB);
/* 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,
MAC_NUBUS_FIRST_SLOT * NUBUS_SUPER_SLOT_SIZE,
MAC_NUBUS_SLOT_NB * NUBUS_SUPER_SLOT_SIZE);
memory_region_init_alias(&s->slot_alias, obj, "slot-alias",
- &nb->bus->nubus_mr,
+ &bus->nubus_mr,
NUBUS_SLOT_BASE +
MAC_NUBUS_FIRST_SLOT * NUBUS_SLOT_SIZE,
MAC_NUBUS_SLOT_NB * NUBUS_SLOT_SIZE);
diff --git a/hw/nubus/nubus-bridge.c b/hw/nubus/nubus-bridge.c
index 3b68d4435c58..1adda7f5a609 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)
--
2.31.1
- [PULL 00/20] Q800 for 6.2 patches, Laurent Vivier, 2021/09/29
- [PULL 01/20] nubus: add comment indicating reference documents, Laurent Vivier, 2021/09/29
- [PULL 05/20] nubus: move slot bitmap checks from NubusDevice realize() to BusClass check_address(), Laurent Vivier, 2021/09/29
- [PULL 09/20] macfb: don't register declaration ROM, Laurent Vivier, 2021/09/29
- [PULL 04/20] nubus: use bitmap to manage available slots, Laurent Vivier, 2021/09/29
- [PULL 10/20] nubus-device: remove nubus_register_rom() and nubus_register_format_block(), Laurent Vivier, 2021/09/29
- [PULL 11/20] nubus-device: add romfile property for loading declaration ROMs, Laurent Vivier, 2021/09/29
- [PULL 12/20] nubus: move nubus to its own 32-bit address space, Laurent Vivier, 2021/09/29
- [PULL 02/20] nubus-device: rename slot_nb variable to slot, Laurent Vivier, 2021/09/29
- [PULL 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge,
Laurent Vivier <=
- [PULL 15/20] nubus: move NubusBus from mac-nubus-bridge to nubus-bridge, Laurent Vivier, 2021/09/29
- [PULL 03/20] nubus-device: expose separate super slot memory region, Laurent Vivier, 2021/09/29
- [PULL 06/20] nubus: implement BusClass get_dev_path(), Laurent Vivier, 2021/09/29
- [PULL 18/20] nubus: add support for slot IRQs, Laurent Vivier, 2021/09/29
- [PULL 07/20] nubus: add trace-events for empty slot accesses, Laurent Vivier, 2021/09/29
- [PULL 08/20] nubus: generate bus error when attempting to access empty slots, Laurent Vivier, 2021/09/29
- [PULL 20/20] q800: configure nubus available slots for Quadra 800, Laurent Vivier, 2021/09/29
- [PULL 13/20] nubus-bridge: introduce separate NubusBridge structure, Laurent Vivier, 2021/09/29
- [PULL 19/20] q800: wire up nubus IRQs, Laurent Vivier, 2021/09/29
- [PULL 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge, Laurent Vivier, 2021/09/29