q800: move macfb device to Q800MachineState
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> Message-Id: <20230621085353.113233-23-mark.cave-ayland@ilande.co.uk> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
parent
464085e8f6
commit
7a1f3acb3f
|
@ -452,7 +452,9 @@ static void q800_machine_init(MachineState *machine)
|
||||||
|
|
||||||
/* framebuffer in nubus slot #9 */
|
/* 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, "slot", 9);
|
||||||
qdev_prop_set_uint32(dev, "width", graphic_width);
|
qdev_prop_set_uint32(dev, "width", graphic_width);
|
||||||
qdev_prop_set_uint32(dev, "height", graphic_height);
|
qdev_prop_set_uint32(dev, "height", graphic_height);
|
||||||
|
@ -462,7 +464,7 @@ static void q800_machine_init(MachineState *machine)
|
||||||
} else {
|
} else {
|
||||||
qdev_prop_set_uint8(dev, "display", MACFB_DISPLAY_VGA);
|
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;
|
macfb_mode = (NUBUS_MACFB(dev)->macfb).mode;
|
||||||
|
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
#include "hw/scsi/esp.h"
|
#include "hw/scsi/esp.h"
|
||||||
#include "hw/block/swim.h"
|
#include "hw/block/swim.h"
|
||||||
#include "hw/nubus/mac-nubus-bridge.h"
|
#include "hw/nubus/mac-nubus-bridge.h"
|
||||||
|
#include "hw/display/macfb.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The main Q800 machine
|
* The main Q800 machine
|
||||||
|
@ -54,6 +55,7 @@ struct Q800MachineState {
|
||||||
SysBusESPState esp;
|
SysBusESPState esp;
|
||||||
Swim swim;
|
Swim swim;
|
||||||
MacNubusBridge mac_nubus_bridge;
|
MacNubusBridge mac_nubus_bridge;
|
||||||
|
MacfbNubusState macfb;
|
||||||
MemoryRegion macio;
|
MemoryRegion macio;
|
||||||
MemoryRegion macio_alias;
|
MemoryRegion macio_alias;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue