diff options
| author | Damien Zammit <damien@zamaudio.com> | 2021-03-28 23:28:44 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2021-03-28 23:28:44 +0200 |
| commit | 16bad28fd2c103b75d8190da67d4aa4e66facf81 (patch) | |
| tree | df4c3f06fff817b2b7c657b9d35d74de7b981ebc | |
| parent | 89dbc9815f6372e33402ad52e5c1c905c6bfd3b0 (diff) | |
linux irq: Avoid hardcoding the number of interrupts.
* linux/dev/arch/i386/kernel/irq.c: Include <i386/irq.h> instead of
<i386/pic.h>.
(irq_action): Use NINTR instead of 16, do not bother expliciting the
initialization.
(install_user_intr_handler, request_irq, free_irq, probe_irq_on,
probe_irq_off, reserve_mach_irqs): Use NINTR instead of 16.
| -rw-r--r-- | linux/dev/arch/i386/kernel/irq.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/linux/dev/arch/i386/kernel/irq.c b/linux/dev/arch/i386/kernel/irq.c index 06889e58..b6729c12 100644 --- a/linux/dev/arch/i386/kernel/irq.c +++ b/linux/dev/arch/i386/kernel/irq.c @@ -29,7 +29,7 @@ #include <kern/assert.h> #include <i386/spl.h> -#include <i386/pic.h> +#include <i386/irq.h> #include <i386/pit.h> #define MACH_INCLUDE @@ -84,13 +84,7 @@ struct linux_action user_intr_t *user_intr; }; -static struct linux_action *irq_action[16] = -{ - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL -}; +static struct linux_action *irq_action[NINTR] = {0}; /* * Generic interrupt handler for Linux devices. @@ -232,7 +226,7 @@ install_user_intr_handler (struct irqdev *dev, int id, unsigned long flags, unsigned int irq = dev->irq[id]; - assert (irq < 16); + assert (irq < NINTR); /* Test whether the irq handler has been set */ // TODO I need to protect the array when iterating it. @@ -279,7 +273,7 @@ request_irq (unsigned int irq, void (*handler) (int, void *, struct pt_regs *), struct linux_action *action; int retval; - assert (irq < 16); + assert (irq < NINTR); if (!handler) return -EINVAL; @@ -315,7 +309,7 @@ free_irq (unsigned int irq, void *dev_id) struct linux_action *action, **p; unsigned long flags; - if (irq > 15) + if (irq >= NINTR) panic ("free_irq: bad irq number"); for (p = irq_action + irq; (action = *p) != NULL; p = &action->next) @@ -354,7 +348,7 @@ probe_irq_on (void) /* * Allocate all available IRQs. */ - for (i = 15; i > 0; i--) + for (i = NINTR - 1; i > 0; i--) { if (!irq_action[i] && ivect[i] == intnull) { @@ -387,7 +381,7 @@ probe_irq_off (unsigned long irqs) /* * Disable unnecessary IRQs. */ - for (i = 15; i > 0; i--) + for (i = NINTR - 1; i > 0; i--) { if (!irq_action[i] && ivect[i] == intnull) { @@ -427,7 +421,7 @@ reserve_mach_irqs (void) { unsigned int i; - for (i = 0; i < 16; i++) + for (i = 0; i < NINTR; i++) { if (ivect[i] != intnull) /* This dummy action does not specify SA_SHIRQ, so |