[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 46/55] lasips2: use sysbus IRQ for output IRQ
From: |
Mark Cave-Ayland |
Subject: |
[PULL 46/55] lasips2: use sysbus IRQ for output IRQ |
Date: |
Sun, 26 Jun 2022 18:45:22 +0100 |
This enables the IRQ to be wired up using sysbus_connect_irq() in
lasips2_initfn().
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220624134109.881989-47-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/input/lasips2.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c
index 49405191cb..bd72505411 100644
--- a/hw/input/lasips2.c
+++ b/hw/input/lasips2.c
@@ -247,16 +247,15 @@ static void lasips2_port_set_irq(void *opaque, int level)
LASIPS2State *lasips2_initfn(hwaddr base, qemu_irq irq)
{
- LASIPS2State *s;
DeviceState *dev;
dev = qdev_new(TYPE_LASIPS2);
qdev_prop_set_uint64(dev, "base", base);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
- s = LASIPS2(dev);
- s->irq = irq;
- return s;
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
+
+ return LASIPS2(dev);
}
static void lasips2_realize(DeviceState *dev, Error **errp)
@@ -285,6 +284,8 @@ static void lasips2_init(Object *obj)
sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->kbd.reg);
sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mouse.reg);
+
+ sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
}
static Property lasips2_properties[] = {
--
2.30.2
- [PULL 35/55] pckbd: replace irq_kbd and irq_mouse with qemu_irq array in KBDState, (continued)
- [PULL 35/55] pckbd: replace irq_kbd and irq_mouse with qemu_irq array in KBDState, Mark Cave-Ayland, 2022/06/26
- [PULL 36/55] pl050: switch over from update_irq() function to PS2 device gpio, Mark Cave-Ayland, 2022/06/26
- [PULL 38/55] lasips2: QOMify LASIPS2State, Mark Cave-Ayland, 2022/06/26
- [PULL 39/55] lasips2: move lasips2 QOM types from lasips2.c to lasips2.h, Mark Cave-Ayland, 2022/06/26
- [PULL 40/55] lasips2: rename lasips2_init() to lasips2_initfn() and update it to return the LASIPS2 device, Mark Cave-Ayland, 2022/06/26
- [PULL 41/55] lasips2: implement lasips2_init() function, Mark Cave-Ayland, 2022/06/26
- [PULL 42/55] lasips2: move mapping of LASIPS2 registers to HPPA machine, Mark Cave-Ayland, 2022/06/26
- [PULL 44/55] lasips2: add base property, Mark Cave-Ayland, 2022/06/26
- [PULL 43/55] lasips2: move initialisation of PS2 ports from lasi_initfn() to lasi_init(), Mark Cave-Ayland, 2022/06/26
- [PULL 45/55] lasips2: implement lasips2_realize(), Mark Cave-Ayland, 2022/06/26
- [PULL 46/55] lasips2: use sysbus IRQ for output IRQ,
Mark Cave-Ayland <=
- [PULL 47/55] lasips2: switch over from update_irq() function to PS2 device gpio, Mark Cave-Ayland, 2022/06/26
- [PULL 48/55] lasips2: add QEMU interface comment, Mark Cave-Ayland, 2022/06/26
- [PULL 49/55] pckbd: switch I8042_MMIO device from update_irq() function to PS2 device gpio, Mark Cave-Ayland, 2022/06/26
- [PULL 50/55] pckbd: add QEMU interface comment for I8042_MMIO device, Mark Cave-Ayland, 2022/06/26
- [PULL 51/55] pckbd: add i8042_reset() function to I8042 device, Mark Cave-Ayland, 2022/06/26
- [PULL 55/55] artist: set memory region owners for buffers to the artist device, Mark Cave-Ayland, 2022/06/26
- [PULL 53/55] pckbd: add QEMU interface comment for I8042 device, Mark Cave-Ayland, 2022/06/26
- [PULL 54/55] ps2: remove update_irq() function and update_arg parameter, Mark Cave-Ayland, 2022/06/26
- [PULL 52/55] pckbd: switch I8042 device from update_irq() function to PS2 device gpio, Mark Cave-Ayland, 2022/06/26
- Re: [PULL 00/55] qemu-sparc queue 20220626, Richard Henderson, 2022/06/27