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

new cons.h location, etc.

Browse Source
This commit is contained in:
cgd 1994-02-01 03:42:08 +00:00
parent f1ab8b020a
commit b452451cfe
4 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/i386/isa/com.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: com.c,v 1.16 1994/01/30 16:41:27 ws Exp $
* $Id: com.c,v 1.17 1994/02/01 03:42:08 cgd Exp $
*/
#include "com.h"
@ -273,17 +273,8 @@ comwrite(dev, uio, flag)
dev_t dev;
struct uio *uio;
{
int unit = UNIT(dev);
register struct tty *tp = com_tty[unit];
/*
* (XXX) We disallow virtual consoles if the physical console is
* a serial port. This is in case there is a display attached that
* is not the console. In that situation we don't need/want the X
* server taking over the console.
*/
if (constty && unit == comconsole)
constty = NULL;
return ((*linesw[tp->t_line].l_write)(tp, uio, flag));
}
@ -606,7 +597,7 @@ commctl(dev, bits, how)
/*
* Following are all routines needed for COM to act as console
*/
#include <i386/i386/cons.h>
#include <dev/cons.h>
comcnprobe(cp)
struct consdev *cp;

5
sys/arch/i386/isa/pccons.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)pccons.c 5.11 (Berkeley) 5/21/91
* $Id: pccons.c,v 1.38 1994/01/28 13:43:41 deraadt Exp $
* $Id: pccons.c,v 1.39 1994/02/01 03:43:41 cgd Exp $
*/
#include "pc.h"
@ -56,11 +56,12 @@
#include <sys/kernel.h>
#include <sys/syslog.h>
#include <dev/cons.h>
#include <machine/pio.h>
#include <machine/pccons.h>
#include <machine/pc/display.h>
#include <i386/i386/cons.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/icu.h>
#include <i386/isa/isa.h>

13
sys/dev/ic/com.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: com.c,v 1.16 1994/01/30 16:41:27 ws Exp $
* $Id: com.c,v 1.17 1994/02/01 03:42:08 cgd Exp $
*/
#include "com.h"
@ -273,17 +273,8 @@ comwrite(dev, uio, flag)
dev_t dev;
struct uio *uio;
{
int unit = UNIT(dev);
register struct tty *tp = com_tty[unit];
/*
* (XXX) We disallow virtual consoles if the physical console is
* a serial port. This is in case there is a display attached that
* is not the console. In that situation we don't need/want the X
* server taking over the console.
*/
if (constty && unit == comconsole)
constty = NULL;
return ((*linesw[tp->t_line].l_write)(tp, uio, flag));
}
@ -606,7 +597,7 @@ commctl(dev, bits, how)
/*
* Following are all routines needed for COM to act as console
*/
#include <i386/i386/cons.h>
#include <dev/cons.h>
comcnprobe(cp)
struct consdev *cp;

13
sys/dev/isa/com.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: com.c,v 1.16 1994/01/30 16:41:27 ws Exp $
* $Id: com.c,v 1.17 1994/02/01 03:42:08 cgd Exp $
*/
#include "com.h"
@ -273,17 +273,8 @@ comwrite(dev, uio, flag)
dev_t dev;
struct uio *uio;
{
int unit = UNIT(dev);
register struct tty *tp = com_tty[unit];
/*
* (XXX) We disallow virtual consoles if the physical console is
* a serial port. This is in case there is a display attached that
* is not the console. In that situation we don't need/want the X
* server taking over the console.
*/
if (constty && unit == comconsole)
constty = NULL;
return ((*linesw[tp->t_line].l_write)(tp, uio, flag));
}
@ -606,7 +597,7 @@ commctl(dev, bits, how)
/*
* Following are all routines needed for COM to act as console
*/
#include <i386/i386/cons.h>
#include <dev/cons.h>
comcnprobe(cp)
struct consdev *cp;