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

Bring back CONSPEED as a last-ditch default if you can't change the speed

Browse Source 
any other way.

Requested by: dfr
This commit is contained in:
Paul Traina 1997-06-04 16:25:15 +00:00
parent f4084c0544
commit 5ea6cb03f3
11 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/conf/NOTES
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in # LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can. # as much of the source tree as it can.
# #
# $Id: LINT,v 1.340 1997/05/25 07:18:22 peter Exp $ # $Id: LINT,v 1.341 1997/06/04 04:55:26 pst Exp $
# #
# NB: You probably don't want to try running a kernel built from this # NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from # file. Instead, you should start from GENERIC, and add options from
@ -827,6 +827,7 @@ device sio0 at isa? port "IO_COM1" tty flags 0x10 irq 4 vector siointr
# Options for serial drivers that support consoles (only for sio now): # Options for serial drivers that support consoles (only for sio now):
options BREAK_TO_DEBUGGER #a BREAK on a comconsole goes to options BREAK_TO_DEBUGGER #a BREAK on a comconsole goes to
#DDB, if available. #DDB, if available.
options CONSPEED=9600 #default speed for serial console (default 9600)
# Options for sio: # Options for sio:
options COM_ESP #code for Hayes ESP options COM_ESP #code for Hayes ESP

4
sys/conf/options.i386
View File

@ -1,4 +1,4 @@
# $Id: options.i386,v 1.45 1997/05/22 08:47:40 msmith Exp $ # $Id: options.i386,v 1.46 1997/06/04 04:55:00 pst Exp $
BOUNCEPAGES opt_bounce.h BOUNCEPAGES opt_bounce.h
USER_LDT USER_LDT
@ -15,10 +15,10 @@ PERFMON opt_perfmon.h
AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_1 opt_auto_eoi.h
AUTO_EOI_2 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h
BREAK_TO_DEBUGGER opt_comconsole.h BREAK_TO_DEBUGGER opt_comconsole.h
CONSPEED opt_comconsole.h
COMCONSOLE opt_defunct.h COMCONSOLE opt_defunct.h
CONADDR opt_defunct.h CONADDR opt_defunct.h
CONUNIT opt_defunct.h CONUNIT opt_defunct.h
CONSPEED opt_defunct.h
COM_ESP opt_sio.h COM_ESP opt_sio.h
COM_MULTIPORT opt_sio.h COM_MULTIPORT opt_sio.h
DSI_SOFT_MODEM opt_sio.h DSI_SOFT_MODEM opt_sio.h

4
sys/dev/sio/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)com.c 7.5 (Berkeley) 5/16/91 * 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" #include "opt_comconsole.h"
@ -346,7 +346,7 @@ static struct cdevsw sio_cdevsw = {
}; };
static int comconsole = -1; 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 u_int com_events; /* input chars + weighted output completions */
static Port_t siocniobase; static Port_t siocniobase;
static int sio_timeout; static int sio_timeout;

7
sys/dev/sio/sioreg.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)comreg.h 7.2 (Berkeley) 5/9/91 * 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 $
*/ */
@ -108,3 +108,8 @@
/* speed to initialize to during chip tests */ /* 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

3
sys/i386/conf/LINT
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in # LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can. # as much of the source tree as it can.
# #
# $Id: LINT,v 1.340 1997/05/25 07:18:22 peter Exp $ # $Id: LINT,v 1.341 1997/06/04 04:55:26 pst Exp $
# #
# NB: You probably don't want to try running a kernel built from this # NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from # file. Instead, you should start from GENERIC, and add options from
@ -827,6 +827,7 @@ device sio0 at isa? port "IO_COM1" tty flags 0x10 irq 4 vector siointr
# Options for serial drivers that support consoles (only for sio now): # Options for serial drivers that support consoles (only for sio now):
options BREAK_TO_DEBUGGER #a BREAK on a comconsole goes to options BREAK_TO_DEBUGGER #a BREAK on a comconsole goes to
#DDB, if available. #DDB, if available.
options CONSPEED=9600 #default speed for serial console (default 9600)
# Options for sio: # Options for sio:
options COM_ESP #code for Hayes ESP options COM_ESP #code for Hayes ESP

3
sys/i386/conf/NOTES
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in # LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can. # as much of the source tree as it can.
# #
# $Id: LINT,v 1.340 1997/05/25 07:18:22 peter Exp $ # $Id: LINT,v 1.341 1997/06/04 04:55:26 pst Exp $
# #
# NB: You probably don't want to try running a kernel built from this # NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from # file. Instead, you should start from GENERIC, and add options from
@ -827,6 +827,7 @@ device sio0 at isa? port "IO_COM1" tty flags 0x10 irq 4 vector siointr
# Options for serial drivers that support consoles (only for sio now): # Options for serial drivers that support consoles (only for sio now):
options BREAK_TO_DEBUGGER #a BREAK on a comconsole goes to options BREAK_TO_DEBUGGER #a BREAK on a comconsole goes to
#DDB, if available. #DDB, if available.
options CONSPEED=9600 #default speed for serial console (default 9600)
# Options for sio: # Options for sio:
options COM_ESP #code for Hayes ESP options COM_ESP #code for Hayes ESP

4
sys/i386/conf/options.i386
View File

@ -1,4 +1,4 @@
# $Id: options.i386,v 1.45 1997/05/22 08:47:40 msmith Exp $ # $Id: options.i386,v 1.46 1997/06/04 04:55:00 pst Exp $
BOUNCEPAGES opt_bounce.h BOUNCEPAGES opt_bounce.h
USER_LDT USER_LDT
@ -15,10 +15,10 @@ PERFMON opt_perfmon.h
AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_1 opt_auto_eoi.h
AUTO_EOI_2 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h
BREAK_TO_DEBUGGER opt_comconsole.h BREAK_TO_DEBUGGER opt_comconsole.h
CONSPEED opt_comconsole.h
COMCONSOLE opt_defunct.h COMCONSOLE opt_defunct.h
CONADDR opt_defunct.h CONADDR opt_defunct.h
CONUNIT opt_defunct.h CONUNIT opt_defunct.h
CONSPEED opt_defunct.h
COM_ESP opt_sio.h COM_ESP opt_sio.h
COM_MULTIPORT opt_sio.h COM_MULTIPORT opt_sio.h
DSI_SOFT_MODEM opt_sio.h DSI_SOFT_MODEM opt_sio.h

4
sys/i386/isa/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)com.c 7.5 (Berkeley) 5/16/91 * 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" #include "opt_comconsole.h"
@ -346,7 +346,7 @@ static struct cdevsw sio_cdevsw = {
}; };
static int comconsole = -1; 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 u_int com_events; /* input chars + weighted output completions */
static Port_t siocniobase; static Port_t siocniobase;
static int sio_timeout; static int sio_timeout;

7
sys/i386/isa/sioreg.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)comreg.h 7.2 (Berkeley) 5/9/91 * 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 $
*/ */
@ -108,3 +108,8 @@
/* speed to initialize to during chip tests */ /* 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

4
sys/isa/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)com.c 7.5 (Berkeley) 5/16/91 * 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" #include "opt_comconsole.h"
@ -346,7 +346,7 @@ static struct cdevsw sio_cdevsw = {
}; };
static int comconsole = -1; 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 u_int com_events; /* input chars + weighted output completions */
static Port_t siocniobase; static Port_t siocniobase;
static int sio_timeout; static int sio_timeout;

7
sys/isa/sioreg.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)comreg.h 7.2 (Berkeley) 5/9/91 * 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 $
*/ */
@ -108,3 +108,8 @@
/* speed to initialize to during chip tests */ /* 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