patch-2.1.121 linux/include/asm-arm/arch-nexuspci/irq.h

• Lines: 49
• Date: Sun Sep 6 10:45:30 1998
• Orig file: v2.1.120/linux/include/asm-arm/arch-nexuspci/irq.h
• Orig date: Tue Jul 21 00:15:32 1998

diff -u --recursive --new-file v2.1.120/linux/include/asm-arm/arch-nexuspci/irq.h linux/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);
+	}
 }