[src/netbsd-3]: src/sys/arch/i386/stand/lib Pull up revision 1.6 (requested b...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3c25c4201745
branches:  netbsd-3
changeset: 576436:3c25c4201745
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Jul 02 23:23:20 2005 +0000

description:
Pull up revision 1.6 (requested by manu in ticket #504):
Support PC engines WRAP (From OpenBSD)

diffstat:

 sys/arch/i386/stand/lib/gatea20.c |  17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 2499a93c75f2 -r 3c25c4201745 sys/arch/i386/stand/lib/gatea20.c
--- a/sys/arch/i386/stand/lib/gatea20.c Sat Jul 02 23:22:41 2005 +0000
+++ b/sys/arch/i386/stand/lib/gatea20.c Sat Jul 02 23:23:20 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gatea20.c,v 1.5 2002/08/12 14:27:34 thorpej Exp $      */
+/*     $NetBSD: gatea20.c,v 1.5.22.1 2005/07/02 23:23:20 tron Exp $    */
 
 /* extracted from freebsd:sys/i386/boot/biosboot/io.c */
 
@@ -41,20 +41,29 @@
 #ifdef SUPPORT_PS2
            biosmca_ps2model == 0xf82 ||
 #endif
-           /* XXX How to check for AMD Elan SC520? */
-           0) {
-               outb(0x92, 0x2);
+           (inb(K_STATUS) == 0xff && inb(K_RDWR) == 0xff)) {
+               int data;
+
+               data = inb(0x92);
+               outb(0x92, data | 0x2);
        } else {
                while (inb(K_STATUS) & K_IBUF_FUL);
+
                while (inb(K_STATUS) & K_OBUF_FUL)
                        (void)inb(K_RDWR);
 
                outb(K_CMD, KC_CMD_WOUT);
+
                delay(100);
                while (inb(K_STATUS) & K_IBUF_FUL);
+
                outb(K_RDWR, x_20);
+
                delay(100);
                while (inb(K_STATUS) & K_IBUF_FUL);
+
+               while (inb(K_STATUS) & K_OBUF_FUL)
+                       (void)inb(K_RDWR);
        }
        __asm("popfl");
 }