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

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

details:   https://anonhg.NetBSD.org/src/rev/37f263dcb0f2
branches:  netbsd-1-5
changeset: 491043:37f263dcb0f2
user:      he <he%NetBSD.org@localhost>
date:      Sun Apr 01 16:58:46 2001 +0000

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

diffstat:

 sys/arch/macppc/dev/adb.c |  16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r af7d262a5c5e -r 37f263dcb0f2 sys/arch/macppc/dev/adb.c
--- a/sys/arch/macppc/dev/adb.c Sun Apr 01 16:55:52 2001 +0000
+++ b/sys/arch/macppc/dev/adb.c Sun Apr 01 16:58:46 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $   */
+/*     $NetBSD: adb.c,v 1.6.12.1 2001/04/01 16:58:46 he Exp $  */
 
 /*-
  * Copyright (C) 1994  Bradley A. Grantham
@@ -102,7 +102,8 @@
 {
        struct adb_softc *sc = (struct adb_softc *)self;
        struct confargs *ca = aux;
-
+       int irq = ca->ca_intr[0];
+       int node;
        ADBDataBlock adbdata;
        struct adb_attach_args aa_args;
        int totaladbs;
@@ -121,10 +122,16 @@
        else if (strcmp(ca->ca_name, "via-pmu") == 0)
                adbHardware = ADB_HW_PB;
 
+       node = getnodebyname(OF_parent(ca->ca_node), "extint-gpio1");
+       if (node)
+               OF_getprop(node, "interrupts", &irq, 4);
+
+       printf(" irq %d: ", irq);
+
        adb_polling = 1;
        ADBReInit();
 
-       intr_establish(ca->ca_intr[0], IST_LEVEL, IPL_HIGH, adb_intr, sc);
+       intr_establish(irq, IST_LEVEL, IPL_HIGH, adb_intr, sc);
 
 #ifdef ADB_DEBUG
        if (adb_debug)
@@ -132,8 +139,7 @@
 #endif
        totaladbs = CountADBs();
 
-       printf(" irq %d", ca->ca_intr[0]);
-       printf(": %d targets\n", totaladbs);
+       printf("%d targets\n", totaladbs);
 
 #if NAED > 0
        /* ADB event device for compatibility */