diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
| commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
| tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /include/asm-arm/arch-nexuspci | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'include/asm-arm/arch-nexuspci')
| -rw-r--r-- | include/asm-arm/arch-nexuspci/irq.h | 22 | ||||
| -rw-r--r-- | include/asm-arm/arch-nexuspci/param.h | 8 |
2 files changed, 20 insertions, 10 deletions
diff --git a/include/asm-arm/arch-nexuspci/irq.h b/include/asm-arm/arch-nexuspci/irq.h index cf25a5dea..7b03006dd 100644 --- a/include/asm-arm/arch-nexuspci/irq.h +++ b/include/asm-arm/arch-nexuspci/irq.h @@ -2,6 +2,9 @@ * include/asm-arm/arch-nexuspci/irq.h * * Copyright (C) 1998 Philip Blundell + * + * Changelog: + * 22-08-1998 RMK Restructured IRQ routines */ #include <asm/io.h> @@ -10,29 +13,28 @@ extern unsigned long soft_irq_mask; -static __inline__ void mask_irq(unsigned int irq) +static void nexuspci_mask_irq(unsigned int irq) { writel((irq << 1), INTCONT); soft_irq_mask &= ~(1<<irq); } -#define mask_and_ack_irq(_x) mask_irq(_x) - -static __inline__ void unmask_irq(unsigned int irq) +static void nexuspci_unmask_irq(unsigned int irq) { writel((irq << 1) + 1, INTCONT); soft_irq_mask |= (1<<irq); } -static __inline__ unsigned long get_enabled_irqs(void) -{ - return soft_irq_mask; -} - static __inline__ void irq_init_irq(void) { unsigned int i; /* Disable all interrupts initially. */ - for (i = 0; i < NR_IRQS; i++) + for (i = 0; i < NR_IRQS; i++) { + irq_desc[i].valid = 1; + irq_desc[i].probe_ok = 1; + irq_desc[i].mask_ack = nexuspci_mask_irq; + irq_desc[i].mask = nexuspci_mask_irq; + irq_desc[i].unmask = nexuspci_unmask_irq; mask_irq(i); + } } diff --git a/include/asm-arm/arch-nexuspci/param.h b/include/asm-arm/arch-nexuspci/param.h new file mode 100644 index 000000000..f663d01f2 --- /dev/null +++ b/include/asm-arm/arch-nexuspci/param.h @@ -0,0 +1,8 @@ +/* + * linux/include/asm-arm/arch-nexuspci/param.h + * + * Copyright (C) 1996 Russell King + * Copyright (C) 1998 Philip Blundell + */ + +#define HZ 100 |