d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Yank out Christoph Robitschko's hack for the hanging console problem as

Browse Source 
it didn't actually fix it, and because starting the getty on /dev/console
instead of /dev/vga is a good work-around.
This commit is contained in:
dg 1993-10-18 14:21:48 +00:00
parent 504871ed88
commit 44c91c00c3
2 changed files with 4 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/i386/i386/cons.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: @(#)cons.c 7.2 (Berkeley) 5/9/91
* $Id$
* $Id: cons.c,v 1.3 1993/10/16 14:14:49 rgrimes Exp $
*/
@ -49,7 +49,6 @@
#include "sys/tty.h"
#include "sys/file.h"
#include "sys/conf.h"
#include "sys/vnode.h"
#include "cons.h"
@ -99,25 +98,14 @@ cninit()
(*cp->cn_init)(cp);
}
static struct vnode *cnopenvp = NULLVP;
cnopen(dev, flag, mode, p)
dev_t dev;
int flag, mode;
struct proc *p;
{
int error;
if (cn_tab == NULL)
return (0);
dev = cn_tab->cn_dev;
if (cnopenvp == NULLVP)
if ((error = getdevvp(dev, &cnopenvp, VCHR))) {
printf("cnopen: getdevvp returned %d !\n", error);
return(error);
}
return ((*cdevsw[major(dev)].d_open)(dev, flag, mode, p));
}
@ -126,21 +114,10 @@ cnclose(dev, flag, mode, p)
int flag, mode;
struct proc *p;
{
int error;
if (cn_tab == NULL)
return (0);
dev = cn_tab->cn_dev;
if (vcount(cnopenvp) <= 1)
error = (*cdevsw[major(dev)].d_close)(dev, flag, mode, p);
else
error = 0;
if (error == 0) {
vrele(cnopenvp);
cnopenvp = NULLVP;
return(error);
}
return ((*cdevsw[major(dev)].d_close)(dev, flag, mode, p));
}
cnread(dev, uio, flag)

27
sys/kern/tty_cons.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: @(#)cons.c 7.2 (Berkeley) 5/9/91
* $Id$
* $Id: cons.c,v 1.3 1993/10/16 14:14:49 rgrimes Exp $
*/
@ -49,7 +49,6 @@
#include "sys/tty.h"
#include "sys/file.h"
#include "sys/conf.h"
#include "sys/vnode.h"
#include "cons.h"
@ -99,25 +98,14 @@ cninit()
(*cp->cn_init)(cp);
}
static struct vnode *cnopenvp = NULLVP;
cnopen(dev, flag, mode, p)
dev_t dev;
int flag, mode;
struct proc *p;
{
int error;
if (cn_tab == NULL)
return (0);
dev = cn_tab->cn_dev;
if (cnopenvp == NULLVP)
if ((error = getdevvp(dev, &cnopenvp, VCHR))) {
printf("cnopen: getdevvp returned %d !\n", error);
return(error);
}
return ((*cdevsw[major(dev)].d_open)(dev, flag, mode, p));
}
@ -126,21 +114,10 @@ cnclose(dev, flag, mode, p)
int flag, mode;
struct proc *p;
{
int error;
if (cn_tab == NULL)
return (0);
dev = cn_tab->cn_dev;
if (vcount(cnopenvp) <= 1)
error = (*cdevsw[major(dev)].d_close)(dev, flag, mode, p);
else
error = 0;
if (error == 0) {
vrele(cnopenvp);
cnopenvp = NULLVP;
return(error);
}
return ((*cdevsw[major(dev)].d_close)(dev, flag, mode, p));
}
cnread(dev, uio, flag)