partial fix of icu bugs.

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

diff --git a/usr/src/sys/i386/isa/icu.h b/usr/src/sys/i386/isa/icu.h
index 8f4864b..84c198c 100644 (file)
--- a/usr/src/sys/i386/isa/icu.h
+++ b/usr/src/sys/i386/isa/icu.h
@@ -5,9 +5,9 @@
  * 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.redist.c%
+ * %sccs.include.386.c%

  *
  *

- *     @(#)icu.h       5.6 (Berkeley) %G%
+ *     @(#)icu.h       5.7 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -43,11 +43,18 @@ extern      unsigned short netmask; /* group of interrupts masked with splimp() */
 
 /* Mask a group of interrupts atomically */
 #define        INTR(unit,mask,offst) \
 
 /* Mask a group of interrupts atomically */
 #define        INTR(unit,mask,offst) \

+       cli ; \

        pushl   $0 ; \
        pushl   $0 ; \

+       nop ; \

        pushl   $ T_ASTFLT ; \
        pushl   $ T_ASTFLT ; \

+       nop ; \

        pushal ; \
        pushal ; \

-       push    %ds ; \
-       push    %es ; \
+       nop ; \
+       movb    $0x20,%al ; \
+       outb    %al,$ IO_ICU1 ; \
+       outb    %al,$ IO_ICU2 ; \
+       pushl   %ds ; \
+       pushl   %es ; \

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


@@ -59,28 +66,19 @@ extern      unsigned short netmask; /* group of interrupts masked with splimp() */
        orw     mask ,%ax ; \
        movw    %ax,_cpl ; \
        orw     _imen,%ax ; \
        orw     mask ,%ax ; \
        movw    %ax,_cpl ; \
        orw     _imen,%ax ; \

-       NOP ; \

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

-       NOP ; \

        movb    %ah,%al ; \
        outb    %al,$ IO_ICU2+1 ; \
        movb    %ah,%al ; \
        outb    %al,$ IO_ICU2+1 ; \

-       NOP     ; \
-       inb     $0x84,%al ; \
-       sti
+       sti ;

 
 /* Interrupt vector exit macros */
 
 /* First eight interrupts (ICU1) */
 #define        INTREXIT1       \
 
 /* 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       \
        jmp     doreti
 
 /* Second eight interrupts (ICU2) */
 #define        INTREXIT2       \

-       movb    $0x20,%al ; \
-       outb    %al,$ IO_ICU1 ; \
-       outb    %al,$ IO_ICU2 ; \

        jmp     doreti
 
 #endif
        jmp     doreti
 
 #endif