aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2021-09-24 08:38:03 +0100
committerLaurent Vivier <laurent@vivier.eu>2021-09-29 10:45:19 +0200
commit1fa04232db5946d9648ffc03718aad9b6de87c38 (patch)
tree1090b34ed75b15b5cb901870132f00314b45e78f /include
parentf48d613484bb8969469c9edcfc0bbe410c88d645 (diff)
nubus: move NubusBus from mac-nubus-bridge to nubus-bridge
Now that Nubus has its own address space rather than mapping directly into the system bus, move the Nubus reference from MacNubusBridge to NubusBridge. 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-16-mark.cave-ayland@ilande.co.uk> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'include')
-rw-r--r--include/hw/nubus/mac-nubus-bridge.h1
-rw-r--r--include/hw/nubus/nubus.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/hw/nubus/mac-nubus-bridge.h b/include/hw/nubus/mac-nubus-bridge.h
index b595e1b7ef..70ab50ab2d 100644
--- a/include/hw/nubus/mac-nubus-bridge.h
+++ b/include/hw/nubus/mac-nubus-bridge.h
@@ -22,7 +22,6 @@ OBJECT_DECLARE_SIMPLE_TYPE(MacNubusBridge, MAC_NUBUS_BRIDGE)
struct MacNubusBridge {
NubusBridge parent_obj;
- NubusBus *bus;
MemoryRegion super_slot_alias;
MemoryRegion slot_alias;
};
diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index 11bcc9bb36..2d00d18150 100644
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -62,6 +62,8 @@ struct NubusDevice {
struct NubusBridge {
SysBusDevice parent_obj;
+
+ NubusBus *bus;
};
#endif