mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lasi: use qdev GPIOs to wire up IRQs in lasi_initfn()

Browse Source 
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220504092600.10048-31-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2022-05-04 10:25:40 +01:00
parent cb9f6c4b65
commit e004499fd5
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/hppa/lasi.c
View File

@ -234,38 +234,31 @@ static void lasi_set_irq(void *opaque, int irq, int level)
DeviceState *lasi_initfn(MemoryRegion *address_space) DeviceState *lasi_initfn(MemoryRegion *address_space)
{ {
DeviceState *dev; DeviceState *dev;
LasiState *s;
dev = qdev_new(TYPE_LASI_CHIP); dev = qdev_new(TYPE_LASI_CHIP);
s = LASI_CHIP(dev);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
/* LAN */ /* LAN */
if (enable_lasi_lan()) { if (enable_lasi_lan()) {
qemu_irq lan_irq = qemu_allocate_irq(lasi_set_irq, s, lasi_82596_init(address_space, LASI_LAN_HPA,
LASI_IRQ_LAN_HPA); qdev_get_gpio_in(dev, LASI_IRQ_LAN_HPA));
lasi_82596_init(address_space, LASI_LAN_HPA, lan_irq);
} }
/* Parallel port */ /* 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, 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)) { if (serial_hd(1)) {
/* Serial port */ /* 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_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); serial_hd(0), DEVICE_NATIVE_ENDIAN);
} }
/* PS/2 Keyboard/Mouse */ /* PS/2 Keyboard/Mouse */
qemu_irq ps2kbd_irq = qemu_allocate_irq(lasi_set_irq, s, lasips2_init(address_space, LASI_PS2KBD_HPA,
LASI_IRQ_PS2KBD_HPA); qdev_get_gpio_in(dev, LASI_IRQ_PS2KBD_HPA));
lasips2_init(address_space, LASI_PS2KBD_HPA, ps2kbd_irq);
return dev; return dev;
} }