OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

q800: move VIA1 device to Q800MachineState 

Also change the instantiation of the VIA1 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-13-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Mark Cave-Ayland 2023-06-21 09:53:41 +01:00 committed by Laurent Vivier
parent f18a288632
commit 6d32c0643f
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/m68k/q800.c
View File

@ -212,7 +212,7 @@ static void q800_machine_init(MachineState *machine)
hwaddr parameters_base; hwaddr parameters_base;
CPUState *cs; CPUState *cs;
DeviceState *dev; DeviceState *dev;
DeviceState *via1_dev, *via2_dev; DeviceState *via2_dev;
DeviceState *escc_orgate; DeviceState *escc_orgate;
SysBusESPState *sysbus_esp; SysBusESPState *sysbus_esp;
ESPState *esp; ESPState *esp;
@ -260,23 +260,25 @@ static void q800_machine_init(MachineState *machine)
sysbus_realize(SYS_BUS_DEVICE(&m->glue), &error_fatal); sysbus_realize(SYS_BUS_DEVICE(&m->glue), &error_fatal);
/* VIA 1 */ /* VIA 1 */
via1_dev = qdev_new(TYPE_MOS6522_Q800_VIA1); object_initialize_child(OBJECT(machine), "via1", &m->via1,
TYPE_MOS6522_Q800_VIA1);
dinfo = drive_get(IF_MTD, 0, 0); dinfo = drive_get(IF_MTD, 0, 0);
if (dinfo) { if (dinfo) {
qdev_prop_set_drive(via1_dev, "drive", blk_by_legacy_dinfo(dinfo)); qdev_prop_set_drive(DEVICE(&m->via1), "drive",
blk_by_legacy_dinfo(dinfo));
} }
sysbus = SYS_BUS_DEVICE(via1_dev); sysbus = SYS_BUS_DEVICE(&m->via1);
sysbus_realize_and_unref(sysbus, &error_fatal); sysbus_realize(sysbus, &error_fatal);
memory_region_add_subregion(&m->macio, VIA_BASE - IO_BASE, memory_region_add_subregion(&m->macio, VIA_BASE - IO_BASE,
sysbus_mmio_get_region(sysbus, 1)); sysbus_mmio_get_region(sysbus, 1));
sysbus_connect_irq(sysbus, 0, sysbus_connect_irq(sysbus, 0,
qdev_get_gpio_in(DEVICE(&m->glue), GLUE_IRQ_IN_VIA1)); qdev_get_gpio_in(DEVICE(&m->glue), GLUE_IRQ_IN_VIA1));
/* A/UX mode */ /* A/UX mode */
qdev_connect_gpio_out(via1_dev, 0, qdev_connect_gpio_out(DEVICE(&m->via1), 0,
qdev_get_gpio_in_named(DEVICE(&m->glue), qdev_get_gpio_in_named(DEVICE(&m->glue),
"auxmode", 0)); "auxmode", 0));
adb_bus = qdev_get_child_bus(via1_dev, "adb.0"); adb_bus = qdev_get_child_bus(DEVICE(&m->via1), "adb.0");
dev = qdev_new(TYPE_ADB_KEYBOARD); dev = qdev_new(TYPE_ADB_KEYBOARD);
qdev_realize_and_unref(dev, adb_bus, &error_fatal); qdev_realize_and_unref(dev, adb_bus, &error_fatal);
dev = qdev_new(TYPE_ADB_MOUSE); dev = qdev_new(TYPE_ADB_MOUSE);

2
include/hw/m68k/q800.h
View File

@ -28,6 +28,7 @@
#include "target/m68k/cpu-qom.h" #include "target/m68k/cpu-qom.h"
#include "exec/memory.h" #include "exec/memory.h"
#include "hw/m68k/q800-glue.h" #include "hw/m68k/q800-glue.h"
#include "hw/misc/mac_via.h"
/* /*
* The main Q800 machine * The main Q800 machine
@ -39,6 +40,7 @@ struct Q800MachineState {
M68kCPU cpu; M68kCPU cpu;
MemoryRegion rom; MemoryRegion rom;
GLUEState glue; GLUEState glue;
MOS6522Q800VIA1State via1;
MemoryRegion macio; MemoryRegion macio;
MemoryRegion macio_alias; MemoryRegion macio_alias;
}; };