[src/netbsd-1-4]: src/sys/arch/macppc/dev pullup 1.5->1.6 (thorpej)

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

details:   https://anonhg.NetBSD.org/src/rev/7f858cae9e96
branches:  netbsd-1-4
changeset: 468667:7f858cae9e96
user:      perry <perry%NetBSD.org@localhost>
date:      Thu May 06 02:01:27 1999 +0000

description:
pullup 1.5->1.6 (thorpej)

diffstat:

 sys/arch/macppc/dev/obio.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r a7d1c3eeee8e -r 7f858cae9e96 sys/arch/macppc/dev/obio.c
--- a/sys/arch/macppc/dev/obio.c        Thu May 06 02:00:42 1999 +0000
+++ b/sys/arch/macppc/dev/obio.c        Thu May 06 02:01:27 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: obio.c,v 1.5 1998/12/22 19:46:28 tsubai Exp $  */
+/*     $NetBSD: obio.c,v 1.5.2.1 1999/05/06 02:01:27 perry Exp $       */
 
 /*-
  * Copyright (C) 1998  Internet Research Institute, Inc.
@@ -72,7 +72,7 @@
                case 0x02:      /* gc */
                case 0x07:      /* ohare */
                case 0x10:      /* mac-io "Heathrow" */
-               case 0x17:      /* mac-io "Paddington" (untested) */
+               case 0x17:      /* mac-io "Paddington" */
                        return 1;
                }
 
@@ -97,6 +97,7 @@
 
        switch (PCI_PRODUCT(pa->pa_id)) {
 
+       /* XXX should not use name */
        case 0x02:
                node = OF_finddevice("/bandit/gc");
                break;
@@ -107,7 +108,9 @@
 
        case 0x10:
        case 0x17:
-               node = OF_finddevice("/pci/mac-io");
+               node = OF_finddevice("mac-io");
+               if (node == -1)
+                       node = OF_finddevice("/pci/mac-io");
                break;
 
        default: