diff options
| author | pst <pst@FreeBSD.org> | 1997-06-04 16:25:15 +0000 |
|---|---|---|
| committer | pst <pst@FreeBSD.org> | 1997-06-04 16:25:15 +0000 |
| commit | d3c9fa6b5e6347bf54f48619c40d870566ef7691 (patch) | |
| tree | 4de1a8df2700e2027c234b6b26676072e7aea59e /sys/isa | |
| parent | 013b17e93c835c88011f39a63e378f3926f6f465 (diff) | |
| download | FreeBSD-src-d3c9fa6b5e6347bf54f48619c40d870566ef7691.zip FreeBSD-src-d3c9fa6b5e6347bf54f48619c40d870566ef7691.tar.gz | |
Bring back CONSPEED as a last-ditch default if you can't change the speed
any other way.
Requested by: dfr
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/sio.c | 4 | ||||
| -rw-r--r-- | sys/isa/sioreg.h | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 70a1b1d..2fe4aa0 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.169 1997/06/01 20:42:01 phk Exp $ + * $Id: sio.c,v 1.170 1997/06/04 04:52:39 pst Exp $ */ #include "opt_comconsole.h" @@ -346,7 +346,7 @@ static struct cdevsw sio_cdevsw = { }; static int comconsole = -1; -static volatile speed_t comdefaultrate = TTYDEF_SPEED; +static volatile speed_t comdefaultrate = CONSPEED; static u_int com_events; /* input chars + weighted output completions */ static Port_t siocniobase; static int sio_timeout; diff --git a/sys/isa/sioreg.h b/sys/isa/sioreg.h index 97a737a..4a0c4cf 100644 --- a/sys/isa/sioreg.h +++ b/sys/isa/sioreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)comreg.h 7.2 (Berkeley) 5/9/91 - * $Id: sioreg.h,v 1.8 1997/04/05 13:15:50 bde Exp $ + * $Id: sioreg.h,v 1.9 1997/06/04 04:52:40 pst Exp $ */ @@ -107,4 +107,9 @@ #define MSR_DCTS 0x01 /* speed to initialize to during chip tests */ -#define SIO_TEST_SPEED 9600 +#define SIO_TEST_SPEED 9600 + +/* default serial console speed if not set with sysctl or probed from boot */ +#ifndef CONSPEED +#define CONSPEED 9600 +#endif |
