[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/8] q800: wire up auxmode GPIO to GLUE
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 5/8] q800: wire up auxmode GPIO to GLUE |
Date: |
Wed, 20 Oct 2021 14:41:28 +0100 |
This enables the GLUE logic to change its CPU level IRQ routing depending upon
whether the hardware has been configured for A/UX mode.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
hw/m68k/q800.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 81c335bf16..0093872d89 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -100,6 +100,7 @@ struct GLUEState {
SysBusDevice parent_obj;
M68kCPU *cpu;
uint8_t ipr;
+ uint8_t auxmode;
};
#define GLUE_IRQ_IN_VIA1 0
@@ -145,11 +146,19 @@ static void GLUE_set_irq(void *opaque, int irq, int level)
m68k_set_irq_level(s->cpu, 0, 0);
}
+static void glue_auxmode_set_irq(void *opaque, int irq, int level)
+{
+ GLUEState *s = GLUE(opaque);
+
+ s->auxmode = level;
+}
+
static void glue_reset(DeviceState *dev)
{
GLUEState *s = GLUE(dev);
s->ipr = 0;
+ s->auxmode = 0;
}
static const VMStateDescription vmstate_glue = {
@@ -158,6 +167,7 @@ static const VMStateDescription vmstate_glue = {
.minimum_version_id = 0,
.fields = (VMStateField[]) {
VMSTATE_UINT8(ipr, GLUEState),
+ VMSTATE_UINT8(auxmode, GLUEState),
VMSTATE_END_OF_LIST(),
},
};
@@ -178,6 +188,7 @@ static void glue_init(Object *obj)
DeviceState *dev = DEVICE(obj);
qdev_init_gpio_in(dev, GLUE_set_irq, 8);
+ qdev_init_gpio_in_named(dev, glue_auxmode_set_irq, "auxmode", 1);
}
static void glue_class_init(ObjectClass *klass, void *data)
@@ -308,6 +319,9 @@ static void q800_init(MachineState *machine)
sysbus_realize_and_unref(sysbus, &error_fatal);
sysbus_mmio_map(sysbus, 1, VIA_BASE);
sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in(glue, GLUE_IRQ_IN_VIA1));
+ /* A/UX mode */
+ qdev_connect_gpio_out(via1_dev, 0,
+ qdev_get_gpio_in_named(glue, "auxmode", 0));
adb_bus = qdev_get_child_bus(via1_dev, "adb.0");
dev = qdev_new(TYPE_ADB_KEYBOARD);
--
2.20.1
- [PATCH v2 0/8] q800: GLUE updates for A/UX mode, Mark Cave-Ayland, 2021/10/20
- [PATCH v2 1/8] mac_via: update comment for VIA1B_vMystery bit, Mark Cave-Ayland, 2021/10/20
- [PATCH v2 2/8] q800: move VIA1 IRQ from level 1 to level 6, Mark Cave-Ayland, 2021/10/20
- [PATCH v2 3/8] q800: use GLUE IRQ numbers instead of IRQ level for GLUE IRQs, Mark Cave-Ayland, 2021/10/20
- [PATCH v2 5/8] q800: wire up auxmode GPIO to GLUE,
Mark Cave-Ayland <=
- [PATCH v2 4/8] mac_via: add GPIO for A/UX mode, Mark Cave-Ayland, 2021/10/20
- [PATCH v2 6/8] q800: route SONIC on-board Ethernet IRQ via nubus IRQ 9 in classic mode, Mark Cave-Ayland, 2021/10/20
- [PATCH v2 8/8] q800: add NMI handler, Mark Cave-Ayland, 2021/10/20
- [PATCH v2 7/8] q800: wire up remaining IRQs in classic mode, Mark Cave-Ayland, 2021/10/20