changes in the way interrupt code works

SCCS-vsn: sys/i386/isa/icu.h 5.3

diff --git a/usr/src/sys/i386/isa/icu.h b/usr/src/sys/i386/isa/icu.h
index e3e6532..5a29a9f 100644 (file)
--- a/usr/src/sys/i386/isa/icu.h
+++ b/usr/src/sys/i386/isa/icu.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.386.c%
  *
  *
  * %sccs.include.386.c%
  *

- *     @(#)icu.h       5.2 (Berkeley) %G%
+ *     @(#)icu.h       5.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -24,27 +24,30 @@ extern      unsigned short  cpl;    /* current priority level */
 
 extern unsigned short ttymask; /* things that get masked with spltty() */
 extern unsigned short biomask; /* things that get masked with splbio() */
 
 extern unsigned short ttymask; /* things that get masked with spltty() */
 extern unsigned short biomask; /* things that get masked with splbio() */

+extern unsigned short netmask; /* things that get masked with splimp() */

 
 #define        INTREN(s)       imen &= ~(s)
 #define        INTRDIS(s)      imen |= (s)
 
 #define        INTREN(s)       imen &= ~(s)
 #define        INTRDIS(s)      imen |= (s)

+#define        INTRMASK(msk,s) msk |= (s)

 #endif
 
 #endif
 

-/* Interrupt enable bits */
-#define        IRQ0    0x0001          /* highest priority - timer */
-#define        IRQ1    0x0002
-#define        IRQ8    0x0100
-#define        IRQ9    0x0200
-#define        IRQ2    IRQ9
-#define        IRQ10   0x0400
-#define        IRQ11   0x0800
-#define        IRQ12   0x1000
-#define        IRQ13   0x2000
-#define        IRQ14   0x4000
-#define        IRQ15   0x8000
-#define        IRQ3    0x0008
-#define        IRQ4    0x0010
-#define        IRQ5    0x0020
-#define        IRQ6    0x0040
-#define        IRQ7    0x0080          /* lowest - parallel printer */
+/* Interrupt enable bits -- in order of priority */
+#define        IRQ0            0x0001          /* highest priority - timer */
+#define        IRQ1            0x0002
+#define        IRQ_SLAVE       0x0004
+#define        IRQ8            0x0100
+#define        IRQ9            0x0200
+#define        IRQ2            IRQ9
+#define        IRQ10           0x0400
+#define        IRQ11           0x0800
+#define        IRQ12           0x1000
+#define        IRQ13           0x2000
+#define        IRQ14           0x4000
+#define        IRQ15           0x8000
+#define        IRQ3            0x0008
+#define        IRQ4            0x0010
+#define        IRQ5            0x0020
+#define        IRQ6            0x0040
+#define        IRQ7            0x0080          /* lowest - parallel printer */

 
 #endif __ICU__
 
 #endif __ICU__