[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 28/53] lasi: replace lasi_get_irq() with defined constants
From: |
Mark Cave-Ayland |
Subject: |
[PULL 28/53] lasi: replace lasi_get_irq() with defined constants |
Date: |
Sun, 8 May 2022 20:56:25 +0100 |
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220504092600.10048-29-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/hppa/lasi.c | 31 ++++---------------------------
hw/hppa/lasi.h | 9 +++++++++
2 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/hw/hppa/lasi.c b/hw/hppa/lasi.c
index c1dfd5310f..ec079601a1 100644
--- a/hw/hppa/lasi.c
+++ b/hw/hppa/lasi.c
@@ -231,29 +231,6 @@ static void lasi_set_irq(void *opaque, int irq, int level)
}
}
-static int lasi_get_irq(unsigned long hpa)
-{
- switch (hpa) {
- case LASI_HPA:
- return 14;
- case LASI_UART_HPA:
- return 5;
- case LASI_LPT_HPA:
- return 7;
- case LASI_LAN_HPA:
- return 8;
- case LASI_SCSI_HPA:
- return 9;
- case LASI_AUDIO_HPA:
- return 13;
- case LASI_PS2KBD_HPA:
- case LASI_PS2MOU_HPA:
- return 26;
- default:
- g_assert_not_reached();
- }
-}
-
DeviceState *lasi_initfn(MemoryRegion *address_space)
{
DeviceState *dev;
@@ -266,20 +243,20 @@ DeviceState *lasi_initfn(MemoryRegion *address_space)
/* LAN */
if (enable_lasi_lan()) {
qemu_irq lan_irq = qemu_allocate_irq(lasi_set_irq, s,
- lasi_get_irq(LASI_LAN_HPA));
+ LASI_IRQ_LAN_HPA);
lasi_82596_init(address_space, LASI_LAN_HPA, lan_irq);
}
/* Parallel port */
qemu_irq lpt_irq = qemu_allocate_irq(lasi_set_irq, s,
- lasi_get_irq(LASI_LPT_HPA));
+ LASI_IRQ_LPT_HPA);
parallel_mm_init(address_space, LASI_LPT_HPA + 0x800, 0,
lpt_irq, parallel_hds[0]);
if (serial_hd(1)) {
/* Serial port */
qemu_irq serial_irq = qemu_allocate_irq(lasi_set_irq, s,
- lasi_get_irq(LASI_UART_HPA));
+ LASI_IRQ_UART_HPA);
serial_mm_init(address_space, LASI_UART_HPA + 0x800, 0,
serial_irq, 8000000 / 16,
serial_hd(0), DEVICE_NATIVE_ENDIAN);
@@ -287,7 +264,7 @@ DeviceState *lasi_initfn(MemoryRegion *address_space)
/* PS/2 Keyboard/Mouse */
qemu_irq ps2kbd_irq = qemu_allocate_irq(lasi_set_irq, s,
- lasi_get_irq(LASI_PS2KBD_HPA));
+ LASI_IRQ_PS2KBD_HPA);
lasips2_init(address_space, LASI_PS2KBD_HPA, ps2kbd_irq);
return dev;
diff --git a/hw/hppa/lasi.h b/hw/hppa/lasi.h
index 559aae2560..f40546da6e 100644
--- a/hw/hppa/lasi.h
+++ b/hw/hppa/lasi.h
@@ -38,6 +38,15 @@ OBJECT_DECLARE_SIMPLE_TYPE(LasiState, LASI_CHIP)
#define ICR_BUS_ERROR_BIT LASI_BIT(8) /* bit 8 in ICR */
#define ICR_TOC_BIT LASI_BIT(1) /* bit 1 in ICR */
+#define LASI_IRQ_HPA 14
+#define LASI_IRQ_UART_HPA 5
+#define LASI_IRQ_LPT_HPA 7
+#define LASI_IRQ_LAN_HPA 8
+#define LASI_IRQ_SCSI_HPA 9
+#define LASI_IRQ_AUDIO_HPA 13
+#define LASI_IRQ_PS2KBD_HPA 26
+#define LASI_IRQ_PS2MOU_HPA 26
+
struct LasiState {
PCIHostState parent_obj;
--
2.20.1
- [PULL 23/53] lasi: checkpatch fixes, (continued)
- [PULL 23/53] lasi: checkpatch fixes, Mark Cave-Ayland, 2022/05/08
- [PULL 24/53] lasi: move memory region initialisation to new lasi_init() function, Mark Cave-Ayland, 2022/05/08
- [PULL 20/53] dino: use numerical constant for iar0 and iar1 reset values, Mark Cave-Ayland, 2022/05/08
- [PULL 19/53] hppa: move dino_init() from dino.c to machine.c, Mark Cave-Ayland, 2022/05/08
- [PULL 21/53] dino: move DINO HPA constants from hppa_hardware.h to dino.h, Mark Cave-Ayland, 2022/05/08
- [PULL 22/53] dino: move from hw/hppa to hw/pci-host, Mark Cave-Ayland, 2022/05/08
- [PULL 25/53] lasi: move register memory mapping from lasi.c to machine.c, Mark Cave-Ayland, 2022/05/08
- [PULL 26/53] lasi: move initialisation of iar and rtc to new lasi_reset() function, Mark Cave-Ayland, 2022/05/08
- [PULL 27/53] lasi: move LASIState and associated QOM structures to lasi.h, Mark Cave-Ayland, 2022/05/08
- [PULL 29/53] lasi: define IRQ inputs as qdev GPIOs, Mark Cave-Ayland, 2022/05/08
- [PULL 28/53] lasi: replace lasi_get_irq() with defined constants,
Mark Cave-Ayland <=
- [PULL 31/53] lasi: fix serial port initialisation, Mark Cave-Ayland, 2022/05/08
- [PULL 30/53] lasi: use qdev GPIOs to wire up IRQs in lasi_initfn(), Mark Cave-Ayland, 2022/05/08
- [PULL 32/53] lasi: update lasi_initfn() to return LASIState, Mark Cave-Ayland, 2022/05/08
- [PULL 37/53] lasi: remove address space parameter from lasi_initfn(), Mark Cave-Ayland, 2022/05/08
- [PULL 33/53] lasi: move LAN initialisation to machine.c, Mark Cave-Ayland, 2022/05/08
- [PULL 36/53] lasi: move PS2 initialisation to machine.c, Mark Cave-Ayland, 2022/05/08
- [PULL 34/53] lasi: move parallel port initialisation to machine.c, Mark Cave-Ayland, 2022/05/08
- [PULL 41/53] hppa: move device headers from hppa_sys.h into individual .c files, Mark Cave-Ayland, 2022/05/08
- [PULL 42/53] lasi: move from hw/hppa to hw/misc, Mark Cave-Ayland, 2022/05/08
- [PULL 38/53] lasi: move lasi_initfn() to machine.c, Mark Cave-Ayland, 2022/05/08