[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 13/20] nubus-bridge: introduce separate NubusBridge structure
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v6 13/20] nubus-bridge: introduce separate NubusBridge structure |
Date: |
Fri, 24 Sep 2021 08:38:01 +0100 |
This is to allow the Nubus bridge to store its own additional state. Also update
the comment in the file header to reflect that nubus-bridge is not specific to
the Macintosh.
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>
---
hw/nubus/nubus-bridge.c | 4 ++--
include/hw/nubus/mac-nubus-bridge.h | 2 +-
include/hw/nubus/nubus.h | 6 ++++++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/hw/nubus/nubus-bridge.c b/hw/nubus/nubus-bridge.c
index cd8c6a91eb..95662568c5 100644
--- a/hw/nubus/nubus-bridge.c
+++ b/hw/nubus/nubus-bridge.c
@@ -1,5 +1,5 @@
/*
- * QEMU Macintosh Nubus
+ * QEMU Nubus
*
* Copyright (c) 2013-2018 Laurent Vivier <laurent@vivier.eu>
*
@@ -22,7 +22,7 @@ static void nubus_bridge_class_init(ObjectClass *klass, void
*data)
static const TypeInfo nubus_bridge_info = {
.name = TYPE_NUBUS_BRIDGE,
.parent = TYPE_SYS_BUS_DEVICE,
- .instance_size = sizeof(SysBusDevice),
+ .instance_size = sizeof(NubusBridge),
.class_init = nubus_bridge_class_init,
};
diff --git a/include/hw/nubus/mac-nubus-bridge.h
b/include/hw/nubus/mac-nubus-bridge.h
index 04451d357c..fa454f5fbe 100644
--- a/include/hw/nubus/mac-nubus-bridge.h
+++ b/include/hw/nubus/mac-nubus-bridge.h
@@ -20,7 +20,7 @@
OBJECT_DECLARE_SIMPLE_TYPE(MacNubusState, MAC_NUBUS_BRIDGE)
struct MacNubusState {
- SysBusDevice sysbus_dev;
+ NubusBridge parent_obj;
NubusBus *bus;
MemoryRegion super_slot_alias;
diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index 9f9386afed..11bcc9bb36 100644
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -10,6 +10,7 @@
#define HW_NUBUS_NUBUS_H
#include "hw/qdev-properties.h"
+#include "hw/sysbus.h"
#include "exec/address-spaces.h"
#include "qom/object.h"
#include "qemu/units.h"
@@ -32,6 +33,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(NubusDevice, NUBUS_DEVICE)
OBJECT_DECLARE_SIMPLE_TYPE(NubusBus, NUBUS_BUS)
#define TYPE_NUBUS_BRIDGE "nubus-bridge"
+OBJECT_DECLARE_SIMPLE_TYPE(NubusBridge, NUBUS_BRIDGE);
struct NubusBus {
BusState qbus;
@@ -58,4 +60,8 @@ struct NubusDevice {
MemoryRegion decl_rom;
};
+struct NubusBridge {
+ SysBusDevice parent_obj;
+};
+
#endif
--
2.20.1
- Re: [PATCH v6 04/20] nubus: use bitmap to manage available slots, (continued)
- [PATCH v6 05/20] nubus: move slot bitmap checks from NubusDevice realize() to BusClass check_address(), Mark Cave-Ayland, 2021/09/24
- [PATCH v6 06/20] nubus: implement BusClass get_dev_path(), Mark Cave-Ayland, 2021/09/24
- [PATCH v6 08/20] nubus: generate bus error when attempting to access empty slots, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 07/20] nubus: add trace-events for empty slot accesses, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 09/20] macfb: don't register declaration ROM, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 10/20] nubus-device: remove nubus_register_rom() and nubus_register_format_block(), Mark Cave-Ayland, 2021/09/24
- [PATCH v6 11/20] nubus-device: add romfile property for loading declaration ROMs, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 12/20] nubus: move nubus to its own 32-bit address space, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 13/20] nubus-bridge: introduce separate NubusBridge structure,
Mark Cave-Ayland <=
- [PATCH v6 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 15/20] nubus: move NubusBus from mac-nubus-bridge to nubus-bridge, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 17/20] nubus-bridge: make slot_available_mask a qdev property, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 18/20] nubus: add support for slot IRQs, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 19/20] q800: wire up nubus IRQs, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 20/20] q800: configure nubus available slots for Quadra 800, Mark Cave-Ayland, 2021/09/24
- Re: [PATCH v6 00/20] nubus: bus, device, bridge, IRQ and address space improvements, Laurent Vivier, 2021/09/29