From fcc485e5736241c15a73b192007d9ad825248b71 Mon Sep 17 00:00:00 2001
From: mark <mark@NetBSD.org>
Date: Tue, 15 Oct 1996 00:39:23 +0000
Subject: [PATCH] Define a separate set of irq numbers for ARM7500 machines if
 RC7500 is not defined as the ARM7500 in A7000 machines has different
 interrupt numbers than the ARM7500 in RC7500 machines.

---
 sys/arch/arm32/include/irqhandler.h | 64 +++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 3 deletions(-)

diff --git a/sys/arch/arm32/include/irqhandler.h b/sys/arch/arm32/include/irqhandler.h
index 80035a9e0d89..bb9c6cbe0e0b 100644
--- a/sys/arch/arm32/include/irqhandler.h
+++ b/sys/arch/arm32/include/irqhandler.h
@@ -1,4 +1,4 @@
-/* $NetBSD: irqhandler.h,v 1.6 1996/06/12 19:47:11 mark Exp $ */
+/* $NetBSD: irqhandler.h,v 1.7 1996/10/15 00:39:23 mark Exp $ */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -47,6 +47,8 @@
 
 /* Define the IRQ bits */
 
+#ifdef CPU_ARM7500
+
 #ifdef RC7500
 
 /*#define IRQ_PRINTER	0x00*/
@@ -92,7 +94,63 @@
  */
 #define IRQ_SDMA	0x1F
 
-#else /* RC7500 */
+#else
+
+/*#define IRQ_PRINTER	0x00*/
+#define IRQ_RESERVED0	0x01
+#define IRQ_BUTTON	0x02
+#define IRQ_FLYBACK	0x03
+#define IRQ_POR		0x04
+#define IRQ_TIMER0	0x05
+#define IRQ_TIMER1 	0x06
+#define IRQ_RESERVED1	0x07
+
+#define IRQ_DREQ3	0x08
+/*#define IRQ_HD1		0x09*/
+/*#define IRQ_HD		IRQ_HD1*/
+#define IRQ_DREQ2	0x0A
+#define IRQ_EXTENDED	0x0B
+/*#define IRQ_FLOPPY	0x0C*/
+/*#define IRQ_SERIAL	0x0D*/
+#define IRQ_PODULE	0x0D
+#define IRQ_KBDTX	0x0E
+#define IRQ_KBDRX	0x0F
+
+#define IRQ_IRQ3	0x10
+#define IRQ_IRQ4	0x11
+#define IRQ_IRQ5	0x12
+#define IRQ_IRQ6	0x13
+#define IRQ_IRQ7	0x14
+#define IRQ_IRQ9	0x15
+#define IRQ_IRQ10	0x16
+#define IRQ_IRQ11	0x17
+
+#define IRQ_MSDRX	0x18
+#define IRQ_MSDTX	0x19
+#define IRQ_ATOD	0x1A
+#define IRQ_CLOCK	0x1B
+#define IRQ_PANIC	0x1C
+#define IRQ_RESERVED2	0x1D
+#define IRQ_RESERVED3	0x1E
+
+/*
+ * Note that Sound DMA IRQ is on the 31st vector.
+ * It's not part of the IRQD.
+ */
+#define IRQ_SDMA	0x1F
+
+#define IRQ_EXPCARD0	0x20
+#define IRQ_EXPCARD1	0x21
+#define IRQ_EXPCARD2	0x22
+#define IRQ_EXPCARD3	0x23
+#define IRQ_EXPCARD4	0x24
+#define IRQ_EXPCARD5	0x25
+#define IRQ_EXPCARD6	0x26
+#define IRQ_EXPCARD7	0x27
+
+
+#endif	/* RC7500 */
+#else	/* CPU_ARM7500 */
 
 /*#define IRQ_PRINTER	0x00*/
 #define IRQ_RESERVED0	0x01
@@ -130,7 +188,7 @@
 #define IRQ_EXPCARD6	0x1E
 #define IRQ_EXPCARD7	0x1F
 
-#endif /* RC7500 */
+#endif	/* CPU_ARM7500 */
 
 #define IRQ_VSYNC	IRQ_FLYBACK	/* Aliased */
 #define IRQ_NETSLOT	IRQ_EXTENDED