--- Net2/arch/i386/isa/icu.h	2018/04/24 18:04:01	1.1
+++ Net2/arch/i386/isa/icu.h	2018/04/24 18:20:01	1.1.1.3
@@ -33,7 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)icu.h	5.6 (Berkeley) 5/9/91
+ *	from: @(#)icu.h	5.6 (Berkeley) 5/9/91
+ *	icu.h,v 1.6 1993/07/19 08:27:06 cgd Exp
  */
 
 /*
@@ -49,65 +50,27 @@
 /*
  * Interrupt "level" mechanism variables, masks, and macros
  */
-extern	unsigned short	imen;	/* interrupt mask enable */
-extern	unsigned short	cpl;	/* current priority level mask */
-
-extern	unsigned short highmask; /* group of interrupts masked with splhigh() */
-extern	unsigned short ttymask; /* group of interrupts masked with spltty() */
-extern	unsigned short biomask; /* group of interrupts masked with splbio() */
-extern	unsigned short netmask; /* group of interrupts masked with splimp() */
-
-#define	INTREN(s)	imen &= ~(s)
-#define	INTRDIS(s)	imen |= (s)
-#define	INTRMASK(msk,s)	msk |= (s)
+extern	unsigned imen;		/* interrupt mask enable */
+extern	unsigned cpl;		/* current priority level mask */
 
+extern	unsigned highmask;	/* group of interrupts masked with splhigh() */
+extern	unsigned ttymask;	/* group of interrupts masked with spltty() */
+extern	unsigned biomask;	/* group of interrupts masked with splbio() */
+extern	unsigned netmask;	/* group of interrupts masked with splnet() */
+extern	unsigned impmask;	/* group of interrupts masked with splimp() */
+
+#define	INTREN(s)	(imen &= ~(s), SET_ICUS())
+#define	INTRDIS(s)	(imen |= (s), SET_ICUS())
+#define	INTRMASK(msk,s)	(msk |= (s))
+#if 0
+#define SET_ICUS()	(outb(IO_ICU1 + 1, imen), outb(IU_ICU2 + 1, imen >> 8))
 #else
-
 /*
- * Macro's for interrupt level priority masks (used in interrupt vector entry)
+ * XXX - IO_ICU* are defined in isa.h, not icu.h, and nothing much bothers to
+ * include isa.h, while too many things include icu.h.
  */
-
-/* Mask a group of interrupts atomically */
-#define	INTR(unit,mask,offst) \
-	pushl	$0 ; \
-	pushl	$ T_ASTFLT ; \
-	pushal ; \
-	push	%ds ; \
-	push	%es ; \
-	movw	$0x10, %ax ; \
-	movw	%ax, %ds ; \
-	movw	%ax,%es ; \
-	incl	_cnt+V_INTR ; \
-	incl	_isa_intr + offst * 4 ; \
-	movzwl	_cpl,%eax ; \
-	pushl	%eax ; \
-	pushl	$ unit ; \
-	orw	mask ,%ax ; \
-	movw	%ax,_cpl ; \
-	orw	_imen,%ax ; \
-	NOP ; \
-	outb	%al,$ IO_ICU1+1 ; \
-	NOP ; \
-	movb	%ah,%al ; \
-	outb	%al,$ IO_ICU2+1	; \
-	NOP	; \
-	inb	$0x84,%al ; \
-	sti
-
-/* Interrupt vector exit macros */
-
-/* First eight interrupts (ICU1) */
-#define	INTREXIT1	\
-	movb	$0x20,%al ; \
-	outb	%al,$ IO_ICU1 ; \
-	jmp	doreti
-
-/* Second eight interrupts (ICU2) */
-#define	INTREXIT2	\
-	movb	$0x20,%al ; \
-	outb	%al,$ IO_ICU1 ; \
-	outb	%al,$ IO_ICU2 ; \
-	jmp	doreti
+#define SET_ICUS()	(outb(0x21, imen), outb(0xa1, imen >> 8))
+#endif
 
 #endif