[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 17/24] q800: move escc_orgate device to Q800MachineState
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v4 17/24] q800: move escc_orgate device to Q800MachineState |
Date: |
Wed, 21 Jun 2023 09:53:46 +0100 |
Also change the instantiation of the escc_orgate 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 | 16 +++++++++-------
include/hw/m68k/q800.h | 2 ++
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 8bf94b2511..c6314c6bf9 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 *escc_orgate;
SysBusESPState *sysbus_esp;
ESPState *esp;
SysBusDevice *sysbus;
@@ -361,12 +360,15 @@ static void q800_machine_init(MachineState *machine)
sysbus_realize(sysbus, &error_fatal);
/* Logically OR both its IRQs together */
- escc_orgate = DEVICE(object_new(TYPE_OR_IRQ));
- object_property_set_int(OBJECT(escc_orgate), "num-lines", 2, &error_fatal);
- qdev_realize_and_unref(escc_orgate, NULL, &error_fatal);
- sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in(escc_orgate, 0));
- sysbus_connect_irq(sysbus, 1, qdev_get_gpio_in(escc_orgate, 1));
- qdev_connect_gpio_out(escc_orgate, 0,
+ object_initialize_child(OBJECT(machine), "escc_orgate", &m->escc_orgate,
+ TYPE_OR_IRQ);
+ object_property_set_int(OBJECT(&m->escc_orgate), "num-lines", 2,
+ &error_fatal);
+ dev = DEVICE(&m->escc_orgate);
+ qdev_realize(dev, NULL, &error_fatal);
+ sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in(dev, 0));
+ sysbus_connect_irq(sysbus, 1, qdev_get_gpio_in(dev, 1));
+ qdev_connect_gpio_out(dev, 0,
qdev_get_gpio_in(DEVICE(&m->glue),
GLUE_IRQ_IN_ESCC));
memory_region_add_subregion(&m->macio, SCC_BASE - IO_BASE,
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 9e76a3fe7c..36e1bd8e4e 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -31,6 +31,7 @@
#include "hw/misc/mac_via.h"
#include "hw/net/dp8393x.h"
#include "hw/char/escc.h"
+#include "hw/or-irq.h"
/*
* The main Q800 machine
@@ -46,6 +47,7 @@ struct Q800MachineState {
MOS6522Q800VIA2State via2;
dp8393xState dp8393x;
ESCCState escc;
+ OrIRQState escc_orgate;
MemoryRegion macio;
MemoryRegion macio_alias;
};
--
2.30.2
- Re: [PATCH v4 07/24] q800: move GLUE device into separate q800-glue.c file, (continued)
- [PATCH v4 09/24] q800: move GLUE device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 10/24] q800: introduce mac-io container memory region, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 11/24] q800: reimplement mac-io region aliasing using IO memory region, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 12/24] q800: move VIA1 device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 13/24] q800: move VIA2 device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 14/24] hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 15/24] q800: move dp8393x device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 16/24] q800: move ESCC device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 18/24] q800: move ESP device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 17/24] q800: move escc_orgate device to Q800MachineState,
Mark Cave-Ayland <=
- [PATCH v4 19/24] q800: move SWIM device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 20/24] q800: move mac-nubus-bridge device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 21/24] q800: don't access Nubus bus directly from the mac-nubus-bridge device, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 22/24] q800: move macfb device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 24/24] mac_via: fix rtc command decoding for the PRAM seconds registers, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 23/24] mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf, Mark Cave-Ayland, 2023/06/21
- Re: [PATCH v4 00/24] q800: add support for booting MacOS Classic - part 1, Philippe Mathieu-Daudé, 2023/06/21