BSD 4_4 release

[unix-history] / usr / src / sys / i386 / isa / icu.h

diff --git a/usr/src/sys/i386/isa/icu.h b/usr/src/sys/i386/isa/icu.h
index 84c198c..e42414a 100644 (file)
--- a/usr/src/sys/i386/isa/icu.h
+++ b/usr/src/sys/i386/isa/icu.h
@@ -1,18 +1,39 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
  *

- * %sccs.include.386.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)icu.h       5.7 (Berkeley) %G%
- */
-
-/*
- * AT/386 Interrupt Control constants
- * W. Jolitz 8/89
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)icu.h       8.1 (Berkeley) 6/11/93

  */
 
 #ifndef        __ICU__
  */
 
 #ifndef        __ICU__


@@ -42,17 +63,14 @@ extern      unsigned short netmask; /* group of interrupts masked with splimp() */
  */
 
 /* Mask a group of interrupts atomically */
  */
 
 /* Mask a group of interrupts atomically */

-#define        INTR(unit,mask,offst) \
-       cli ; \
-       pushl   $0 ; \
-       nop ; \
+#define        INTR_HEAD(unit,mask,offst) \
+       pushl   $ offst ; \

        pushl   $ T_ASTFLT ; \
        pushl   $ T_ASTFLT ; \

-       nop ; \

        pushal ; \
        pushal ; \

-       nop ; \

        movb    $0x20,%al ; \
        movb    $0x20,%al ; \

+
+#define INTR_TAIL(unit,mask,offst) \

        outb    %al,$ IO_ICU1 ; \
        outb    %al,$ IO_ICU1 ; \

-       outb    %al,$ IO_ICU2 ; \

        pushl   %ds ; \
        pushl   %es ; \
        movw    $0x10, %ax ; \
        pushl   %ds ; \
        pushl   %es ; \
        movw    $0x10, %ax ; \


@@ -71,6 +89,17 @@ extern       unsigned short netmask; /* group of interrupts masked with splimp() */
        outb    %al,$ IO_ICU2+1 ; \
        sti ;
 
        outb    %al,$ IO_ICU2+1 ; \
        sti ;
 

+#define INTR1(unit,mask,offst) \
+       INTR_HEAD(unit,mask,offst) \
+       INTR_TAIL(unit,mask,offst)
+
+#define INTR2(unit,mask,offst) \
+       INTR_HEAD(unit,mask,offst) \
+       outb    %al,$ IO_ICU2 ; \
+       INTR_TAIL(unit,mask,offst)
+
+
+

 /* Interrupt vector exit macros */
 
 /* First eight interrupts (ICU1) */
 /* Interrupt vector exit macros */
 
 /* First eight interrupts (ICU1) */