[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/24] q800: move VIA2 device to Q800MachineState
From: |
Laurent Vivier |
Subject: |
[PULL 13/24] q800: move VIA2 device to Q800MachineState |
Date: |
Thu, 22 Jun 2023 09:55:33 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
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>
---
include/hw/m68k/q800.h | 1 +
hw/m68k/q800.c | 27 ++++++++++++++++-----------
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 5cf66d08a094..06c771635b3f 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -41,6 +41,7 @@ struct Q800MachineState {
MemoryRegion rom;
GLUEState glue;
MOS6522Q800VIA1State via1;
+ MOS6522Q800VIA2State via2;
MemoryRegion macio;
MemoryRegion macio_alias;
};
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index fccdad5f3c90..988b4981b830 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -212,7 +212,6 @@ static void q800_machine_init(MachineState *machine)
hwaddr parameters_base;
CPUState *cs;
DeviceState *dev;
- DeviceState *via2_dev;
DeviceState *escc_orgate;
SysBusESPState *sysbus_esp;
ESPState *esp;
@@ -285,9 +284,10 @@ static void q800_machine_init(MachineState *machine)
qdev_realize_and_unref(dev, adb_bus, &error_fatal);
/* VIA 2 */
- via2_dev = qdev_new(TYPE_MOS6522_Q800_VIA2);
- sysbus = SYS_BUS_DEVICE(via2_dev);
- sysbus_realize_and_unref(sysbus, &error_fatal);
+ object_initialize_child(OBJECT(machine), "via2", &m->via2,
+ TYPE_MOS6522_Q800_VIA2);
+ sysbus = SYS_BUS_DEVICE(&m->via2);
+ sysbus_realize(sysbus, &error_fatal);
memory_region_add_subregion(&m->macio, VIA_BASE - IO_BASE + VIA_SIZE,
sysbus_mmio_get_region(sysbus, 1));
sysbus_connect_irq(sysbus, 0,
@@ -382,10 +382,14 @@ static void q800_machine_init(MachineState *machine)
sysbus = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(sysbus, &error_fatal);
/* SCSI and SCSI data IRQs are negative edge triggered */
- sysbus_connect_irq(sysbus, 0, qemu_irq_invert(qdev_get_gpio_in(via2_dev,
- VIA2_IRQ_SCSI_BIT)));
- sysbus_connect_irq(sysbus, 1, qemu_irq_invert(qdev_get_gpio_in(via2_dev,
- VIA2_IRQ_SCSI_DATA_BIT)));
+ sysbus_connect_irq(sysbus, 0,
+ qemu_irq_invert(
+ qdev_get_gpio_in(DEVICE(&m->via2),
+ 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,
sysbus_mmio_get_region(sysbus, 0));
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 +
MAC_NUBUS_FIRST_SLOT * NUBUS_SLOT_SIZE);
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));
for (i = 1; i < VIA2_NUBUS_IRQ_NB; 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));
}
@@ -424,7 +429,7 @@ static void q800_machine_init(MachineState *machine)
* IRQ via GLUE for use by SONIC Ethernet in classic mode
*/
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));
nubus = &NUBUS_BRIDGE(dev)->bus;
--
2.40.1
- [PULL 17/24] q800: move escc_orgate device to Q800MachineState, (continued)
- [PULL 17/24] q800: move escc_orgate device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 14/24] hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h, Laurent Vivier, 2023/06/22
- [PULL 21/24] q800: don't access Nubus bus directly from the mac-nubus-bridge device, Laurent Vivier, 2023/06/22
- [PULL 15/24] q800: move dp8393x device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 09/24] q800: move GLUE device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 23/24] mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf, Laurent Vivier, 2023/06/22
- [PULL 24/24] mac_via: fix rtc command decoding for the PRAM seconds registers, Laurent Vivier, 2023/06/22
- [PULL 08/24] q800-glue.c: switch TypeInfo registration to use DEFINE_TYPES() macro, Laurent Vivier, 2023/06/22
- [PULL 11/24] q800: reimplement mac-io region aliasing using IO memory region, Laurent Vivier, 2023/06/22
- [PULL 06/24] q800: move ROM memory region to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 13/24] q800: move VIA2 device to Q800MachineState,
Laurent Vivier <=
- [PULL 16/24] q800: move ESCC device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 07/24] q800: move GLUE device into separate q800-glue.c file, Laurent Vivier, 2023/06/22
- [PULL 18/24] q800: move ESP device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 20/24] q800: move mac-nubus-bridge device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 05/24] q800: move CPU object into Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 19/24] q800: move SWIM device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 22/24] q800: move macfb device to Q800MachineState, Laurent Vivier, 2023/06/22
- Re: [PULL 00/24] Q800 for 8.1 patches, Richard Henderson, 2023/06/22