[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 21/23] q800: move macfb device to Q800MachineState
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v3 21/23] q800: move macfb device to Q800MachineState |
Date: |
Sun, 4 Jun 2023 14:14:48 +0100 |
Also change the instantiation of the macfb device to use
object_initialize_child().
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
hw/m68k/q800.c | 6 ++++--
include/hw/m68k/q800.h | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index df2765dbd1..d314ea40f1 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -452,7 +452,9 @@ static void q800_machine_init(MachineState *machine)
/* framebuffer in nubus slot #9 */
- dev = qdev_new(TYPE_NUBUS_MACFB);
+ object_initialize_child(OBJECT(machine), "macfb", &m->macfb,
+ TYPE_NUBUS_MACFB);
+ dev = DEVICE(&m->macfb);
qdev_prop_set_uint32(dev, "slot", 9);
qdev_prop_set_uint32(dev, "width", graphic_width);
qdev_prop_set_uint32(dev, "height", graphic_height);
@@ -462,7 +464,7 @@ static void q800_machine_init(MachineState *machine)
} else {
qdev_prop_set_uint8(dev, "display", MACFB_DISPLAY_VGA);
}
- qdev_realize_and_unref(dev, BUS(nubus), &error_fatal);
+ qdev_realize(dev, BUS(nubus), &error_fatal);
macfb_mode = (NUBUS_MACFB(dev)->macfb).mode;
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 8f2c572a81..b3d77f1cba 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -35,6 +35,7 @@
#include "hw/scsi/esp.h"
#include "hw/block/swim.h"
#include "hw/nubus/mac-nubus-bridge.h"
+#include "hw/display/macfb.h"
/*
* The main Q800 machine
@@ -54,6 +55,7 @@ struct Q800MachineState {
SysBusESPState esp;
Swim swim;
MacNubusBridge mac_nubus_bridge;
+ MacfbNubusState macfb;
MemoryRegion macio;
MemoryRegion macio_alias;
};
--
2.30.2
- Re: [PATCH v3 13/23] hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h, (continued)
- [PATCH v3 17/23] q800: move ESP device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 20/23] q800: don't access Nubus bus directly from the mac-nubus-bridge device, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 14/23] q800: move dp8393x device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 18/23] q800: move SWIM device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 19/23] q800: move mac-nubus-bridge device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 21/23] q800: move macfb device to Q800MachineState,
Mark Cave-Ayland <=
- [PATCH v3 22/23] mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 23/23] mac_via: fix rtc command decoding for the PRAM seconds registers, Mark Cave-Ayland, 2023/06/04