SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mac-nubus-bridge: rename MacNubusState to MacNubusBridge

Browse Source 
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>
This commit is contained in:
Mark Cave-Ayland 2021-09-24 08:38:02 +01:00 committed by Laurent Vivier
parent 9bf674bc71
commit f48d613484
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/nubus/mac-nubus-bridge.c
View File

@ -1,4 +1,6 @@
/* /*
* QEMU Macintosh Nubus
*
* Copyright (c) 2013-2018 Laurent Vivier <laurent@vivier.eu> * Copyright (c) 2013-2018 Laurent Vivier <laurent@vivier.eu>
* *
* This work is licensed under the terms of the GNU GPL, version 2 or later. * This work is licensed under the terms of the GNU GPL, version 2 or later.
@ -13,7 +15,7 @@
static void mac_nubus_bridge_init(Object *obj) 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); SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
s->bus = NUBUS_BUS(qbus_create(TYPE_NUBUS_BUS, DEVICE(s), NULL)); 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, .name = TYPE_MAC_NUBUS_BRIDGE,
.parent = TYPE_NUBUS_BRIDGE, .parent = TYPE_NUBUS_BRIDGE,
.instance_init = mac_nubus_bridge_init, .instance_init = mac_nubus_bridge_init,
.instance_size = sizeof(MacNubusState), .instance_size = sizeof(MacNubusBridge),
.class_init = mac_nubus_bridge_class_init, .class_init = mac_nubus_bridge_class_init,
}; };

4
include/hw/nubus/mac-nubus-bridge.h
View File

@ -17,9 +17,9 @@
#define MAC_NUBUS_SLOT_NB (MAC_NUBUS_LAST_SLOT - MAC_NUBUS_FIRST_SLOT + 1) #define MAC_NUBUS_SLOT_NB (MAC_NUBUS_LAST_SLOT - MAC_NUBUS_FIRST_SLOT + 1)
#define TYPE_MAC_NUBUS_BRIDGE "mac-nubus-bridge" #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; NubusBridge parent_obj;
NubusBus *bus; NubusBus *bus;