Changeset 438

Timestamp:

Jun 5, 2009, 11:24:02 PM (16 years ago)

Author:

Paul Smedley

Message:

Move definitions from config.h to interrupt.h

Location:

GPL/trunk

Files:

• alsa-kernel/include/sound/config.h (modified) (1 diff)
• include/linux/interrupt.h (modified) (2 diffs)

GPL/trunk/alsa-kernel/include/sound/config.h

@@ -67 +67 @@
 #include <linux/config.h>
 #include <linux/version.h>
-
-#define IRQ_NONE      (0)  /*void*/
-#define IRQ_HANDLED   (1)  /*void*/
-#define IRQ_RETVAL(x) ((x) != 0)  /*void*/
-typedef int irqreturn_t;
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 2, 3)

GPL/trunk/include/linux/interrupt.h

@@ -1 @@
-/* $Id: interrupt.h,v 1.1.1.1 2003/07/02 13:57:00 eleph Exp $ */
-
 /* interrupt.h */
 #ifndef _LINUX_INTERRUPT_H
@@ -8 +6 @@
 //#include <asm/bitops.h>
 #include <asm/atomic.h>
+
+/*
+ * For 2.4.x compatibility, 2.4.x can use
+ *
+ *      typedef void irqreturn_t;
+ *      #define IRQ_NONE
+ *      #define IRQ_HANDLED
+ *      #define IRQ_RETVAL(x)
+ *
+ * To mix old-style and new-style irq handler returns.
+ *
+ * IRQ_NONE means we didn't handle it.
+ * IRQ_HANDLED means that we did have a valid interrupt and handled it.
+ * IRQ_RETVAL(x) selects on the two depending on x being non-zero (for handled)
+ */
+typedef int irqreturn_t;
+
+#define IRQ_NONE        (0)
+#define IRQ_HANDLED     (1)
+#define IRQ_RETVAL(x)   ((x) != 0)
 
 struct irqaction {