[src/netbsd-1-6]: src/sys/arch/macppc/macppc Apply patch (supplied by aymeric...

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

details:   https://anonhg.NetBSD.org/src/rev/67fba1087c66
branches:  netbsd-1-6
changeset: 528353:67fba1087c66
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sat Jul 06 14:05:49 2002 +0000

description:
Apply patch (supplied by aymeric in ticket #438):
        Make new iBooks, TiBooks and eMacs boot correctly; OF_call_method()
        can return negative values different from -1 to indicate failure.
(The change is also part of rev 1.115, which contains more changes than
we're willing to pull up for 1.6)

diffstat:

 sys/arch/macppc/macppc/machdep.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 14703e70fb42 -r 67fba1087c66 sys/arch/macppc/macppc/machdep.c
--- a/sys/arch/macppc/macppc/machdep.c  Sat Jul 06 14:00:05 2002 +0000
+++ b/sys/arch/macppc/macppc/machdep.c  Sat Jul 06 14:05:49 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.113.4.1 2002/06/20 02:49:00 lukem Exp $  */
+/*     $NetBSD: machdep.c,v 1.113.4.2 2002/07/06 14:05:49 lukem Exp $  */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -977,7 +977,7 @@
         */
 
 #if NUKBD > 0
-       if (OF_call_method("`usb-kbd-ihandles", stdin, 0, 1, &ukbds) != -1 &&
+       if (OF_call_method("`usb-kbd-ihandles", stdin, 0, 1, &ukbds) >= 0 &&
            ukbds != NULL && ukbds->ihandle != 0 &&
            OF_instance_to_package(ukbds->ihandle) != -1) {
                printf("console keyboard type: USB\n");
@@ -985,7 +985,7 @@
                goto kbd_found;
        }
        /* Try old method name. */
-       if (OF_call_method("`usb-kbd-ihandle", stdin, 0, 1, &ukbd) != -1 &&
+       if (OF_call_method("`usb-kbd-ihandle", stdin, 0, 1, &ukbd) >= 0 &&
            ukbd != 0 &&
            OF_instance_to_package(ukbd) != -1) {
                printf("console keyboard type: USB\n");
@@ -996,7 +996,7 @@
 #endif
 
 #if NAKBD > 0
-       if (OF_call_method("`adb-kbd-ihandle", stdin, 0, 1, &akbd) != -1 &&
+       if (OF_call_method("`adb-kbd-ihandle", stdin, 0, 1, &akbd) >= 0 &&
            akbd != 0 &&
            OF_instance_to_package(akbd) != -1) {
                printf("console keyboard type: ADB\n");