[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge
From: |
Laurent Vivier |
Subject: |
[PULL 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge |
Date: |
Wed, 29 Sep 2021 11:28:37 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This better reflects that the mac-nubus-bridge device is derived from the
nubus-bridge device, and that the structure represents the state of the bridge
device and not the Nubus itself. Also update the comment in the file header to
reflect that mac-nubus-bridge is 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>
Message-Id: <20210924073808.1041-15-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
include/hw/nubus/mac-nubus-bridge.h | 4 ++--
hw/nubus/mac-nubus-bridge.c | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/include/hw/nubus/mac-nubus-bridge.h
b/include/hw/nubus/mac-nubus-bridge.h
index fa454f5fbe83..b595e1b7ef66 100644
--- a/include/hw/nubus/mac-nubus-bridge.h
+++ b/include/hw/nubus/mac-nubus-bridge.h
@@ -17,9 +17,9 @@
#define MAC_NUBUS_SLOT_NB (MAC_NUBUS_LAST_SLOT - MAC_NUBUS_FIRST_SLOT + 1)
#define TYPE_MAC_NUBUS_BRIDGE "mac-nubus-bridge"
-OBJECT_DECLARE_SIMPLE_TYPE(MacNubusState, MAC_NUBUS_BRIDGE)
+OBJECT_DECLARE_SIMPLE_TYPE(MacNubusBridge, MAC_NUBUS_BRIDGE)
-struct MacNubusState {
+struct MacNubusBridge {
NubusBridge parent_obj;
NubusBus *bus;
diff --git a/hw/nubus/mac-nubus-bridge.c b/hw/nubus/mac-nubus-bridge.c
index 3af4f5d396ae..e241c581b575 100644
--- a/hw/nubus/mac-nubus-bridge.c
+++ b/hw/nubus/mac-nubus-bridge.c
@@ -1,5 +1,7 @@
/*
- * Copyright (c) 2013-2018 Laurent Vivier <laurent@vivier.eu>
+ * QEMU Macintosh Nubus
+ *
+ * Copyright (c) 2013-2018 Laurent Vivier <laurent@vivier.eu>
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
@@ -13,7 +15,7 @@
static void mac_nubus_bridge_init(Object *obj)
{
- MacNubusState *s = MAC_NUBUS_BRIDGE(obj);
+ MacNubusBridge *s = MAC_NUBUS_BRIDGE(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
s->bus = NUBUS_BUS(qbus_create(TYPE_NUBUS_BUS, DEVICE(s), NULL));
@@ -49,7 +51,7 @@ static const TypeInfo mac_nubus_bridge_info = {
.name = TYPE_MAC_NUBUS_BRIDGE,
.parent = TYPE_NUBUS_BRIDGE,
.instance_init = mac_nubus_bridge_init,
- .instance_size = sizeof(MacNubusState),
+ .instance_size = sizeof(MacNubusBridge),
.class_init = mac_nubus_bridge_class_init,
};
--
2.31.1
- [PULL 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge, (continued)
- [PULL 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge, Laurent Vivier, 2021/09/29
- [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 <=
- [PULL 17/20] nubus-bridge: make slot_available_mask a qdev property, Laurent Vivier, 2021/09/29
- Re: [PULL 00/20] Q800 for 6.2 patches, Peter Maydell, 2021/09/30