[src/netbsd-1-4]: src/sys/arch/macppc/macppc pullup 1.43->1.44 (thorpej)

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

details:   https://anonhg.NetBSD.org/src/rev/a4a5f2e8d81e
branches:  netbsd-1-4
changeset: 468695:a4a5f2e8d81e
user:      perry <perry%NetBSD.org@localhost>
date:      Fri May 07 22:39:05 1999 +0000

description:
pullup 1.43->1.44 (thorpej)

diffstat:

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

diffs (44 lines):

diff -r 9d9a64ab721f -r a4a5f2e8d81e sys/arch/macppc/macppc/machdep.c
--- a/sys/arch/macppc/macppc/machdep.c  Fri May 07 18:17:06 1999 +0000
+++ b/sys/arch/macppc/macppc/machdep.c  Fri May 07 22:39:05 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.38.2.2 1999/05/06 19:41:25 perry Exp $   */
+/*     $NetBSD: machdep.c,v 1.38.2.3 1999/05/07 22:39:05 perry Exp $   */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -1105,12 +1105,6 @@
        int stdout;
        char type[16];
 
-       /*
-        * Initialize the PCI chipsets; can't map configuration
-        * space registers yet!
-        */
-       pci_init(0);
-
        l = OF_getprop(chosen, "stdout", &stdout, sizeof(stdout));
        if (l != sizeof(stdout))
                goto nocons;
@@ -1145,7 +1139,7 @@
                        return;
                }
 
-               node = OF_instance_to_package(stdout);
+               node = OF_instance_to_package(stdin);
                bzero(type, sizeof(type));
                l = OF_getprop(node, "name", type, sizeof(type));
                if (l == -1 || l >= sizeof(type) - 1) {
@@ -1179,6 +1173,12 @@
                }
 
                /*
+                * Initialize the PCI chipsets; can't map configuration
+                * space registers yet!
+                */
+               pci_init(0);
+
+               /*
                 * We're not an ADB keyboard; must be USB.  The parent
                 * node is pointing at the root hub.  We need to traverse
                 * back until we find the USB controller.