[src/netbsd-1-5]: src/sys/arch/macppc/dev Pull up revision 1.12 (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/0fdb5ab2e592
branches:  netbsd-1-5
changeset: 491045:0fdb5ab2e592
user:      he <he%NetBSD.org@localhost>
date:      Sun Apr 01 16:59:18 2001 +0000

description:
Pull up revision 1.12 (requested by tsubai):
  Fix Keyboard problem of recent PowerBooks (Pismo, PowerBook G4,
  etc.).

diffstat:

 sys/arch/macppc/dev/pm_direct.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r d20e2fb23071 -r 0fdb5ab2e592 sys/arch/macppc/dev/pm_direct.c
--- a/sys/arch/macppc/dev/pm_direct.c   Sun Apr 01 16:59:02 2001 +0000
+++ b/sys/arch/macppc/dev/pm_direct.c   Sun Apr 01 16:59:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pm_direct.c,v 1.9 2000/06/08 22:10:46 tsubai Exp $     */
+/*     $NetBSD: pm_direct.c,v 1.9.2.1 2001/04/01 16:59:18 he Exp $     */
 
 /*
  * Copyright (C) 1997 Takashi Hamada
@@ -979,7 +979,7 @@
        int i;
        int s;
        int rval;
-       int delay;
+       int timo;
        PMData pmdata;
        struct adbCommand packet;
 
@@ -1040,13 +1040,15 @@
                return 1;
        }
 
+       delay(10000);
+
        adbWaiting = 1;
        adbWaitingCmd = command;
 
        PM_VIA_INTR_ENABLE();
 
        /* wait until the PM interrupt is occured */
-       delay = 0x80000;
+       timo = 0x80000;
        while (adbWaiting == 1) {
                if (read_via_reg(VIA1, vIFR) & 0x14)
                        pm_intr();
@@ -1057,7 +1059,7 @@
                        (void)intr_dispatch(0x70);
 #endif
 #endif
-               if ((--delay) < 0) {
+               if ((--timo) < 0) {
                        splx(s);
                        return 1;
                }