[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 30/50] lasi: use qdev GPIOs to wire up IRQs in lasi_initfn()
From: |
Mark Cave-Ayland |
Subject: |
[PATCH 30/50] lasi: use qdev GPIOs to wire up IRQs in lasi_initfn() |
Date: |
Thu, 21 Apr 2022 20:30:40 +0100 |
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/hppa/lasi.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/hw/hppa/lasi.c b/hw/hppa/lasi.c
index 9489a80bad..32c7514d3a 100644
--- a/hw/hppa/lasi.c
+++ b/hw/hppa/lasi.c
@@ -234,38 +234,31 @@ static void lasi_set_irq(void *opaque, int irq, int level)
DeviceState *lasi_initfn(MemoryRegion *address_space)
{
DeviceState *dev;
- LasiState *s;
dev = qdev_new(TYPE_LASI_CHIP);
- s = LASI_CHIP(dev);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
/* LAN */
if (enable_lasi_lan()) {
- qemu_irq lan_irq = qemu_allocate_irq(lasi_set_irq, s,
- LASI_IRQ_LAN_HPA);
- lasi_82596_init(address_space, LASI_LAN_HPA, lan_irq);
+ lasi_82596_init(address_space, LASI_LAN_HPA,
+ qdev_get_gpio_in(dev, LASI_IRQ_LAN_HPA));
}
/* Parallel port */
- qemu_irq lpt_irq = qemu_allocate_irq(lasi_set_irq, s,
- LASI_IRQ_LPT_HPA);
parallel_mm_init(address_space, LASI_LPT_HPA + 0x800, 0,
- lpt_irq, parallel_hds[0]);
+ qdev_get_gpio_in(dev, LASI_IRQ_LAN_HPA),
+ parallel_hds[0]);
if (serial_hd(1)) {
/* Serial port */
- qemu_irq serial_irq = qemu_allocate_irq(lasi_set_irq, s,
- LASI_IRQ_UART_HPA);
serial_mm_init(address_space, LASI_UART_HPA + 0x800, 0,
- serial_irq, 8000000 / 16,
+ qdev_get_gpio_in(dev, LASI_IRQ_UART_HPA), 8000000 / 16,
serial_hd(0), DEVICE_NATIVE_ENDIAN);
}
/* PS/2 Keyboard/Mouse */
- qemu_irq ps2kbd_irq = qemu_allocate_irq(lasi_set_irq, s,
- LASI_IRQ_PS2KBD_HPA);
- lasips2_init(address_space, LASI_PS2KBD_HPA, ps2kbd_irq);
+ lasips2_init(address_space, LASI_PS2KBD_HPA,
+ qdev_get_gpio_in(dev, LASI_IRQ_PS2KBD_HPA));
return dev;
}
--
2.20.1
- [PATCH 14/50] machine.c: map DINO device during board configuration, (continued)
- [PATCH 14/50] machine.c: map DINO device during board configuration, Mark Cave-Ayland, 2022/04/21
- [PATCH 21/50] dino: move DINO HPA constants from hppa_hardware.h to dino.h, Mark Cave-Ayland, 2022/04/21
- [PATCH 24/50] lasi: move memory region initialisation to new lasi_init() function, Mark Cave-Ayland, 2022/04/21
- [PATCH 26/50] lasi: move initialisation of iar and rtc to new lasi_reset() function, Mark Cave-Ayland, 2022/04/21
- [PATCH 27/50] lasi: move LASIState and associated QOM structures to lasi.h, Mark Cave-Ayland, 2022/04/21
- [PATCH 23/50] lasi: checkpatch fixes, Mark Cave-Ayland, 2022/04/21
- [PATCH 22/50] dino: move from hw/hppa to hw/pci-host, Mark Cave-Ayland, 2022/04/21
- [PATCH 25/50] lasi: move register memory mapping from lasi.c to machine.c, Mark Cave-Ayland, 2022/04/21
- [PATCH 28/50] lasi: replace lasi_get_irq() with defined constants, Mark Cave-Ayland, 2022/04/21
- [PATCH 29/50] lasi: define IRQ inputs as qdev GPIOs, Mark Cave-Ayland, 2022/04/21
- [PATCH 30/50] lasi: use qdev GPIOs to wire up IRQs in lasi_initfn(),
Mark Cave-Ayland <=
- [PATCH 31/50] lasi: fix serial port initialisation, Mark Cave-Ayland, 2022/04/21
- [PATCH 32/50] lasi: update lasi_initfn() to return LASIState, Mark Cave-Ayland, 2022/04/21
- [PATCH 34/50] lasi: move parallel port initialisation to machine.c, Mark Cave-Ayland, 2022/04/21
- [PATCH 36/50] lasi: move PS2 initialisation to machine.c, Mark Cave-Ayland, 2022/04/21
- [PATCH 33/50] lasi: move LAN initialisation to machine.c, Mark Cave-Ayland, 2022/04/21
- [PATCH 39/50] lasi: use constants for device register offsets, Mark Cave-Ayland, 2022/04/21
- [PATCH 35/50] lasi: move second serial port initialisation to machine.c, Mark Cave-Ayland, 2022/04/21
- [PATCH 41/50] hppa: move device headers from hppa_sys.h into individual .c files, Mark Cave-Ayland, 2022/04/21
- [PATCH 37/50] lasi: remove address space parameter from lasi_initfn(), Mark Cave-Ayland, 2022/04/21
- [PATCH 38/50] lasi: move lasi_initfn() to machine.c, Mark Cave-Ayland, 2022/04/21