[src/trunk]: src/sys/arch/macppc/macppc When looking for a console keyboard i...

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

details:   https://anonhg.NetBSD.org/src/rev/a3281fbff985
branches:  trunk
changeset: 519044:a3281fbff985
user:      augustss <augustss%NetBSD.org@localhost>
date:      Mon Dec 10 02:46:05 2001 +0000

description:
When looking for a console keyboard if usb-kbd-ihandles can't be found
then try the old name usb-kbd-ihandle.  This way my old iMac gets the
USB keyboard as console instead on the (non-existent) ADB keyboard.
Suggested by Gabriel Rosenkoetter.

diffstat:

 sys/arch/macppc/macppc/machdep.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r f4ceafb99887 -r a3281fbff985 sys/arch/macppc/macppc/machdep.c
--- a/sys/arch/macppc/macppc/machdep.c  Mon Dec 10 02:07:37 2001 +0000
+++ b/sys/arch/macppc/macppc/machdep.c  Mon Dec 10 02:46:05 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.106 2001/12/05 05:02:11 chs Exp $        */
+/*     $NetBSD: machdep.c,v 1.107 2001/12/10 02:46:05 augustss Exp $   */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -952,18 +952,25 @@
        if (OF_call_method("`usb-kbd-ihandles", stdin, 0, 1, &ukbds) != -1 &&
            ukbds != NULL && ukbds->ihandle != 0 &&
            OF_instance_to_package(ukbds->ihandle) != -1) {
-
                printf("console keyboard type: USB\n");
                ukbd_cnattach();
                goto kbd_found;
        }
+       /* Try old method name. */
+       if (OF_call_method("`usb-kbd-ihandle", stdin, 0, 1, &akbd) != -1 &&
+           akbd != 0 &&
+           OF_instance_to_package(akbd) != -1) {
+               printf("console keyboard type: USB\n");
+               stdin = akbd;
+               ukbd_cnattach();
+               goto kbd_found;
+       }
 #endif
 
 #if NAKBD > 0
        if (OF_call_method("`adb-kbd-ihandle", stdin, 0, 1, &akbd) != -1 &&
            akbd != 0 &&
            OF_instance_to_package(akbd) != -1) {
-
                printf("console keyboard type: ADB\n");
                stdin = akbd;
                akbd_cnattach();