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

Make rcons work, if configured, even when using serial console: 

do rcons_connect() even if using a serial console.
  identify first attached framebuffer as being `rcons' output device.
This commit is contained in:
jonathan 1998-11-23 04:26:15 +00:00
parent 1bf8dbcfa8
commit 89cad55ba4
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arch/pmax/dev/fb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fb.c,v 1.20 1998/03/31 11:32:53 jonathan Exp $ */
/* $NetBSD: fb.c,v 1.21 1998/11/23 04:26:15 jonathan Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -211,8 +211,8 @@ fbconnect (name, info, silent)
if ((fbcd.cd_devs [fbix]->fi_type.fb_boardtype
== info -> fi_type.fb_boardtype)
&& fbcd.cd_devs [fbix]->fi_unit == info -> fi_unit)
goto got_it;
break;
if (fbcd.cd_ndevs >= NFB) {
printf ("fb: more frame buffers probed than configured!\n");
return;
@ -237,15 +237,14 @@ fbconnect (name, info, silent)
first = 0;
}
got_it:
if (!silent)
printf (" (%dx%dx%d)%s",
info -> fi_type.fb_width,
info -> fi_type.fb_height,
info -> fi_type.fb_depth,
(fbix ? ""
(fbix != 0 ? ""
: ((cn_tab -> cn_pri == CN_REMOTE)
? "" : " (console)")));
? " (rcons)" : " (console)")));
return;
}

7
sys/arch/pmax/dev/rcons.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rcons.c,v 1.18 1998/11/19 15:38:23 mrg Exp $ */
/* $NetBSD: rcons.c,v 1.19 1998/11/23 04:26:15 jonathan Exp $ */
/*
* Copyright (c) 1995
@ -120,11 +120,6 @@ rcons_connect (info)
static struct rconsole rc;
static int row, col;
/* If we're running a serial console, don't set up a raster console
even if there's a device that can support it. */
if (cn_tab -> cn_pri == CN_REMOTE)
return;
fbconstty = &rcons_tty [0];
fbconstty->t_dev = makedev(85, 0); /* /dev/console */
fbconstty->t_ispeed = fbconstty->t_ospeed = TTYDEF_SPEED;