diff options
| author | kato <kato@FreeBSD.org> | 1997-06-06 13:09:55 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-06-06 13:09:55 +0000 |
| commit | a6fa42743dc6178534e3c37c5082f0d7ffcbbc4e (patch) | |
| tree | 8141b5fac7d33f21e326bdf0cd35b474ca819617 | |
| parent | d409adad16727cba0ba4a8a0fd98159f0764efcf (diff) | |
| download | FreeBSD-src-a6fa42743dc6178534e3c37c5082f0d7ffcbbc4e.zip FreeBSD-src-a6fa42743dc6178534e3c37c5082f0d7ffcbbc4e.tar.gz | |
Synchronize with sys/i386/isa/sio.c and sioreg.h revisions1.171 and
1.10, respectively.
| -rw-r--r-- | sys/pc98/cbus/sio.c | 4 | ||||
| -rw-r--r-- | sys/pc98/pc98/sio.c | 4 | ||||
| -rw-r--r-- | sys/pc98/pc98/sioreg.h | 9 |
3 files changed, 11 insertions, 6 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index b79eb0e..157579c 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.26 1997/06/02 10:51:34 kato Exp $ + * $Id: sio.c,v 1.27 1997/06/04 10:27:53 kato Exp $ */ #include "opt_comconsole.h" @@ -441,7 +441,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/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index b79eb0e..157579c 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.26 1997/06/02 10:51:34 kato Exp $ + * $Id: sio.c,v 1.27 1997/06/04 10:27:53 kato Exp $ */ #include "opt_comconsole.h" @@ -441,7 +441,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/pc98/pc98/sioreg.h b/sys/pc98/pc98/sioreg.h index b39e256..840df10 100644 --- a/sys/pc98/pc98/sioreg.h +++ b/sys/pc98/pc98/sioreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)comreg.h 7.2 (Berkeley) 5/9/91 - * $Id: sioreg.h,v 1.5 1997/04/05 15:05:16 kato Exp $ + * $Id: sioreg.h,v 1.6 1997/06/04 10:27:53 kato Exp $ */ @@ -111,4 +111,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 |
