[src/trunk]: src/sys/arch/macppc/macppc For whatever reason, we just can't ca...

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

details:   https://anonhg.NetBSD.org/src/rev/0d81707f2ce8
branches:  trunk
changeset: 472806:0d81707f2ce8
user:      wrstuden <wrstuden%NetBSD.org@localhost>
date:      Fri May 07 22:20:38 1999 +0000

description:
For whatever reason, we just can't call pci_init() that early on Bandit
systems.  Why?  Who knows.  Firmware bugs, maybe.  In any case, moving
the call out of the ADB path works.  "Good enough for me."

diffstat:

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

diffs (44 lines):

diff -r 58865e7973c0 -r 0d81707f2ce8 sys/arch/macppc/macppc/machdep.c
--- a/sys/arch/macppc/macppc/machdep.c  Fri May 07 22:04:27 1999 +0000
+++ b/sys/arch/macppc/macppc/machdep.c  Fri May 07 22:20:38 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.43 1999/05/06 19:24:47 thorpej Exp $     */
+/*     $NetBSD: machdep.c,v 1.44 1999/05/07 22:20:38 wrstuden Exp $    */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -1117,12 +1117,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;
@@ -1157,7 +1151,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) {
@@ -1191,6 +1185,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.