Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use /options instead of /chosen to find out where console is. 

(found by Rafal Boni).
This commit is contained in:
petrov 2002-09-21 09:29:33 +00:00
parent d7d0f4149a
commit e2107815a0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arch/sparc64/dev/sab.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sab.c,v 1.2 2002/09/06 13:18:43 gehenna Exp $ */
/* $NetBSD: sab.c,v 1.3 2002/09/21 09:29:33 petrov Exp $ */
/* $OpenBSD: sab.c,v 1.7 2002/04/08 17:49:42 jason Exp $ */
/*
@ -1291,19 +1291,19 @@ sabtty_console_flags(sc)
struct sabtty_softc *sc;
{
int node, channel, cookie;
u_int chosen;
u_int options;
char buf[255];
node = sc->sc_parent->sc_node;
channel = sc->sc_portno;
chosen = OF_finddevice("/chosen");
options = OF_finddevice("/options");
/* Default to channel 0 if there are no explicit prom args */
cookie = 0;
if (node == OF_instance_to_package(OF_stdin())) {
if (OF_getprop(chosen, "input-device", buf,
if (OF_getprop(options, "input-device", buf,
sizeof(buf)) != -1) {
if (strcmp("ttyb", buf) == 0)
cookie = 1;
@ -1316,7 +1316,7 @@ sabtty_console_flags(sc)
/* Default to same channel if there are no explicit prom args */
if (node == OF_instance_to_package(OF_stdout())) {
if (OF_getprop(chosen, "output-device", buf,
if (OF_getprop(options, "output-device", buf,
sizeof(buf)) != -1) {
if (strcmp("ttyb", buf) == 0)
cookie = 1;

10
sys/arch/sparc64/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.36 2002/09/12 12:51:37 abs Exp $ */
/* $NetBSD: zs.c,v 1.37 2002/09/21 09:29:34 petrov Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -836,19 +836,19 @@ zs_console_flags(promunit, node, channel)
int channel;
{
int cookie, flags = 0;
u_int chosen;
u_int options;
char buf[255];
/*
* We'll just to the OBP grovelling down here since that's
* the only type of firmware we support.
*/
chosen = OF_finddevice("/chosen");
options = OF_finddevice("/options");
/* Default to channel 0 if there are no explicit prom args */
cookie = 0;
if (node == OF_instance_to_package(OF_stdin())) {
if (OF_getprop(chosen, "input-device", buf, sizeof(buf)) != -1) {
if (OF_getprop(options, "input-device", buf, sizeof(buf)) != -1) {
if (!strcmp("ttyb", buf))
cookie = 1;
@ -859,7 +859,7 @@ zs_console_flags(promunit, node, channel)
}
if (node == OF_instance_to_package(OF_stdout())) {
if (OF_getprop(chosen, "output-device", buf, sizeof(buf)) != -1) {
if (OF_getprop(options, "output-device", buf, sizeof(buf)) != -1) {
if (!strcmp("ttyb", buf))
cookie = 1;