[src/trunk]: src/sys/arch/sparc64/dev More on fbnode to prom_stdout_node rename.

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

details:   https://anonhg.NetBSD.org/src/rev/7a27da234b6e
branches:  trunk
changeset: 559536:7a27da234b6e
user:      petrov <petrov%NetBSD.org@localhost>
date:      Fri Mar 19 21:10:31 2004 +0000

description:
More on fbnode to prom_stdout_node rename.

diffstat:

 sys/arch/sparc64/dev/consinit.c    |  6 +++---
 sys/arch/sparc64/dev/ffb_mainbus.c |  9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (71 lines):

diff -r ae8e2f8cf1da -r 7a27da234b6e sys/arch/sparc64/dev/consinit.c
--- a/sys/arch/sparc64/dev/consinit.c   Fri Mar 19 20:21:08 2004 +0000
+++ b/sys/arch/sparc64/dev/consinit.c   Fri Mar 19 21:10:31 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: consinit.c,v 1.15 2004/03/19 15:21:42 pk Exp $ */
+/*     $NetBSD: consinit.c,v 1.16 2004/03/19 21:10:31 petrov Exp $     */
 
 /*-
  * Copyright (c) 1999 Eduardo E. Horvath
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.15 2004/03/19 15:21:42 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.16 2004/03/19 21:10:31 petrov Exp $");
 
 #include "opt_ddb.h"
 #include "pcons.h"
@@ -218,7 +218,7 @@
        if ((prom_stdout_node = OF_instance_to_package(stdout)) == 0)
                printf("WARNING: no PROM stdout\n");
 
-       DBPRINT(("stdout package = %x\r\n", fbnode));
+       DBPRINT(("stdout package = %x\r\n", prom_stdout_node));
 
        DBPRINT(("buffer @ %p\r\n", buffer));
 
diff -r ae8e2f8cf1da -r 7a27da234b6e sys/arch/sparc64/dev/ffb_mainbus.c
--- a/sys/arch/sparc64/dev/ffb_mainbus.c        Fri Mar 19 20:21:08 2004 +0000
+++ b/sys/arch/sparc64/dev/ffb_mainbus.c        Fri Mar 19 21:10:31 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffb_mainbus.c,v 1.2 2003/07/15 03:36:05 lukem Exp $    */
+/*     $NetBSD: ffb_mainbus.c,v 1.3 2004/03/19 21:10:31 petrov Exp $   */
 /*     $OpenBSD: creator_mainbus.c,v 1.4 2002/07/26 16:39:04 jason Exp $       */
 
 /*
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffb_mainbus.c,v 1.2 2003/07/15 03:36:05 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb_mainbus.c,v 1.3 2004/03/19 21:10:31 petrov Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -54,6 +54,8 @@
 #include <sparc64/dev/ffbreg.h>
 #include <sparc64/dev/ffbvar.h>
 
+extern int prom_stdout_node;
+
 int    ffb_mainbus_match(struct device *, struct cfdata *, void *);
 void   ffb_mainbus_attach(struct device *, struct device *, void *);
 
@@ -81,7 +83,6 @@
 {
        struct ffb_softc *sc = (struct ffb_softc *)self;
        struct mainbus_attach_args *ma = aux;
-       extern int fbnode;
        int i, nregs;
 
        sc->sc_bt = ma->ma_bustag;
@@ -112,7 +113,7 @@
        }
        sc->sc_nreg = nregs;
 
-       sc->sc_console = (fbnode == ma->ma_node);
+       sc->sc_console = (prom_stdout_node == ma->ma_node);
        sc->sc_node = ma->ma_node;
 
        if (strcmp(ma->ma_name, "SUNW,afb") == 0)