patch-2.1.96 linux/include/asm-arm/arch-arc/irqs.h

• Lines: 53
• Date: Sun Apr 12 11:42:15 1998
• Orig file: v2.1.95/linux/include/asm-arm/arch-arc/irqs.h
• Orig date: Tue Jan 20 16:39:42 1998

diff -u --recursive --new-file v2.1.95/linux/include/asm-arm/arch-arc/irqs.h linux/include/asm-arm/arch-arc/irqs.h
@@ -1,12 +1,26 @@
 /*
  * linux/include/asm-arm/arch-arc/irqs.h
  *
- * Copyright (C) 1996 Russell King, Dave Gilbert (gilbertd@cs.man.ac.uk)
+ * Copyright (C) 1996 Russell King, Dave Gilbert
+ *
+ * Modifications:
+ *  04-04-1998	PJB	Merged arc and a5k versions
  */
 
+#include <linux/config.h>
+
+#if defined(CONFIG_ARCH_A5K)
+#define IRQ_PRINTER		0
+#define IRQ_BATLOW		1
+#define IRQ_FLOPPYINDEX		2
+#define IRQ_FLOPPYDISK		12
+#elif defined(CONFIG_ARCH_ARC)
 #define IRQ_PRINTERBUSY		0
-#define IRQ_SERIALRING		1
+#define	IRQ_SERIALRING		1
 #define IRQ_PRINTERACK		2
+#define IRQ_FLOPPYCHANGED	12
+#endif
+
 #define IRQ_VSYNCPULSE		3
 #define IRQ_POWERON		4
 #define IRQ_TIMER0		5
@@ -16,15 +30,20 @@
 #define IRQ_SOUNDCHANGE		9
 #define IRQ_SERIALPORT		10
 #define IRQ_HARDDISK		11
-#define IRQ_FLOPPYCHANGED	12
 #define IRQ_EXPANSIONCARD	13
 #define IRQ_KEYBOARDTX		14
 #define IRQ_KEYBOARDRX		15
 
-#define FIQ_FLOPPYDATA		0
+#if defined(CONFIG_ARCH_A5K)
+#define FIQ_SERIALPORT		4
+#elif defined(CONFIG_ARCH_ARC)
 #define FIQ_FLOPPYIRQ		1
+#define FIQ_FD1772		FIQ_FLOPPYIRQ
+#endif
+
+#define FIQ_FLOPPYDATA		0
 #define FIQ_ECONET		2
 #define FIQ_EXPANSIONCARD	6
 #define FIQ_FORCE		7
 
-#define FIQ_FD1772		FIQ_FLOPPYIRQ
+#define IRQ_TIMER		IRQ_TIMER0