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

q800: move VIA2 device to Q800MachineState 

Also change the instantiation of the VIA2 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-14-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:42 +01:00 committed by Laurent Vivier
parent 6d32c0643f
commit d7942e166a
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/m68k/q800.c
View File

@ -212,7 +212,6 @@ static void q800_machine_init(MachineState *machine)
hwaddr parameters_base; hwaddr parameters_base;
CPUState *cs; CPUState *cs;
DeviceState *dev; DeviceState *dev;
DeviceState *via2_dev;
DeviceState *escc_orgate; DeviceState *escc_orgate;
SysBusESPState *sysbus_esp; SysBusESPState *sysbus_esp;
ESPState *esp; ESPState *esp;
@ -285,9 +284,10 @@ static void q800_machine_init(MachineState *machine)
qdev_realize_and_unref(dev, adb_bus, &error_fatal); qdev_realize_and_unref(dev, adb_bus, &error_fatal);
/* VIA 2 */ /* VIA 2 */
via2_dev = qdev_new(TYPE_MOS6522_Q800_VIA2); object_initialize_child(OBJECT(machine), "via2", &m->via2,
sysbus = SYS_BUS_DEVICE(via2_dev); TYPE_MOS6522_Q800_VIA2);
sysbus_realize_and_unref(sysbus, &error_fatal); sysbus = SYS_BUS_DEVICE(&m->via2);
sysbus_realize(sysbus, &error_fatal);
memory_region_add_subregion(&m->macio, VIA_BASE - IO_BASE + VIA_SIZE, memory_region_add_subregion(&m->macio, VIA_BASE - IO_BASE + VIA_SIZE,
sysbus_mmio_get_region(sysbus, 1)); sysbus_mmio_get_region(sysbus, 1));
sysbus_connect_irq(sysbus, 0, sysbus_connect_irq(sysbus, 0,
@ -382,10 +382,14 @@ static void q800_machine_init(MachineState *machine)
sysbus = SYS_BUS_DEVICE(dev); sysbus = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(sysbus, &error_fatal); sysbus_realize_and_unref(sysbus, &error_fatal);
/* SCSI and SCSI data IRQs are negative edge triggered */ /* SCSI and SCSI data IRQs are negative edge triggered */
sysbus_connect_irq(sysbus, 0, qemu_irq_invert(qdev_get_gpio_in(via2_dev, sysbus_connect_irq(sysbus, 0,
VIA2_IRQ_SCSI_BIT))); qemu_irq_invert(
sysbus_connect_irq(sysbus, 1, qemu_irq_invert(qdev_get_gpio_in(via2_dev, qdev_get_gpio_in(DEVICE(&m->via2),
VIA2_IRQ_SCSI_DATA_BIT))); VIA2_IRQ_SCSI_BIT)));
sysbus_connect_irq(sysbus, 1,
qemu_irq_invert(
qdev_get_gpio_in(DEVICE(&m->via2),
VIA2_IRQ_SCSI_DATA_BIT)));
memory_region_add_subregion(&m->macio, ESP_BASE - IO_BASE, memory_region_add_subregion(&m->macio, ESP_BASE - IO_BASE,
sysbus_mmio_get_region(sysbus, 0)); sysbus_mmio_get_region(sysbus, 0));
memory_region_add_subregion(&m->macio, ESP_PDMA - IO_BASE, memory_region_add_subregion(&m->macio, ESP_PDMA - IO_BASE,
@ -411,11 +415,12 @@ static void q800_machine_init(MachineState *machine)
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, NUBUS_SLOT_BASE + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, NUBUS_SLOT_BASE +
MAC_NUBUS_FIRST_SLOT * NUBUS_SLOT_SIZE); MAC_NUBUS_FIRST_SLOT * NUBUS_SLOT_SIZE);
qdev_connect_gpio_out(dev, 9, qdev_connect_gpio_out(dev, 9,
qdev_get_gpio_in_named(via2_dev, "nubus-irq", qdev_get_gpio_in_named(DEVICE(&m->via2), "nubus-irq",
VIA2_NUBUS_IRQ_INTVIDEO)); VIA2_NUBUS_IRQ_INTVIDEO));
for (i = 1; i < VIA2_NUBUS_IRQ_NB; i++) { for (i = 1; i < VIA2_NUBUS_IRQ_NB; i++) {
qdev_connect_gpio_out(dev, 9 + i, qdev_connect_gpio_out(dev, 9 + i,
qdev_get_gpio_in_named(via2_dev, "nubus-irq", qdev_get_gpio_in_named(DEVICE(&m->via2),
"nubus-irq",
VIA2_NUBUS_IRQ_9 + i)); VIA2_NUBUS_IRQ_9 + i));
} }
@ -424,7 +429,7 @@ static void q800_machine_init(MachineState *machine)
* IRQ via GLUE for use by SONIC Ethernet in classic mode * IRQ via GLUE for use by SONIC Ethernet in classic mode
*/ */
qdev_connect_gpio_out(DEVICE(&m->glue), GLUE_IRQ_NUBUS_9, qdev_connect_gpio_out(DEVICE(&m->glue), GLUE_IRQ_NUBUS_9,
qdev_get_gpio_in_named(via2_dev, "nubus-irq", qdev_get_gpio_in_named(DEVICE(&m->via2), "nubus-irq",
VIA2_NUBUS_IRQ_9)); VIA2_NUBUS_IRQ_9));
nubus = &NUBUS_BRIDGE(dev)->bus; nubus = &NUBUS_BRIDGE(dev)->bus;

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

@ -41,6 +41,7 @@ struct Q800MachineState {
MemoryRegion rom; MemoryRegion rom;
GLUEState glue; GLUEState glue;
MOS6522Q800VIA1State via1; MOS6522Q800VIA1State via1;
MOS6522Q800VIA2State via2;
MemoryRegion macio; MemoryRegion macio;
MemoryRegion macio_alias; MemoryRegion macio_alias;
}; };