Page MenuHomeFreeBSD
Files F153629983

D36295.id114204.diff
No OneTemporary
Actions

D36295.id114204.diff
View Options

Index: libexec/rc/rc.d/serial
===================================================================
--- libexec/rc/rc.d/serial
+++ libexec/rc/rc.d/serial
@@ -36,7 +36,7 @@
# dtrwait 300 drainwait `sysctl -n kern.drainwait`
# initial cflag from <sys/ttydefaults.h> = cread cs8 hupcl
# initial iflag, lflag and oflag all 0
-# speed 9600
+# speed 115200
# special chars from <sys/ttydefaults.h>
# nothing locked
# except for serial consoles the initial iflag, lflag and oflag are from
@@ -51,9 +51,9 @@
for i in $*
do
comcontrol /dev/tty${dc}${i} dtrwait 300 drainwait $drainwait
- stty < /dev/tty${dc}${i}.init -clocal crtscts hupcl 9600 reprint ^R
+ stty < /dev/tty${dc}${i}.init -clocal crtscts hupcl 115200 reprint ^R
stty < /dev/tty${dc}${i}.lock -clocal -crtscts -hupcl 0
- stty < /dev/cua${dc}${i}.init -clocal crtscts hupcl 9600 reprint ^R
+ stty < /dev/cua${dc}${i}.init -clocal crtscts hupcl 115200 reprint ^R
stty < /dev/cua${dc}${i}.lock -clocal -crtscts -hupcl 0
done
}
Index: sbin/init/ttys
===================================================================
--- sbin/init/ttys
+++ sbin/init/ttys
@@ -46,8 +46,8 @@
ttyu2 "/usr/libexec/getty 3wire" vt100 onifconsole secure
ttyu3 "/usr/libexec/getty 3wire" vt100 onifconsole secure
# Dumb console
-dcons "/usr/libexec/getty std.9600" vt100 off secure
+dcons "/usr/libexec/getty std.115200" vt100 off secure
# Xen Virtual console
xc0 "/usr/libexec/getty Pc" xterm onifconsole secure
# RISC-V HTIF console
-rcons "/usr/libexec/getty std.9600" vt100 onifconsole secure
+rcons "/usr/libexec/getty std.115200" vt100 onifconsole secure
Index: sbin/reboot/boot_i386.8
===================================================================
--- sbin/reboot/boot_i386.8
+++ sbin/reboot/boot_i386.8
@@ -246,7 +246,7 @@
.It Fl S Ns Ar speed
set the speed of the serial console to
.Ar speed .
-The default is 9600 unless it has been overridden by setting
+The default is 115200 unless it has been overridden by setting
.Va BOOT_COMCONSOLE_SPEED
in
.Xr make.conf 5
Index: share/examples/etc/make.conf
===================================================================
--- share/examples/etc/make.conf
+++ share/examples/etc/make.conf
@@ -168,10 +168,9 @@
#
#BOOT_COMCONSOLE_PORT= 0x3F8
#
-# The default serial console speed is 9600. Set the speed to a larger value
-# for better interactive response.
+# The default serial console speed is 115200.
#
-#BOOT_COMCONSOLE_SPEED= 115200
+#BOOT_COMCONSOLE_SPEED= 9600
#
# By default the 'pxeboot' loader retrieves the kernel via NFS. Defining
# this and recompiling /usr/src/stand will cause it to retrieve the kernel
Index: share/man/man4/dcons.4
===================================================================
--- share/man/man4/dcons.4
+++ share/man/man4/dcons.4
@@ -84,7 +84,7 @@
using
.Xr kill 1 .
.Bd -literal -offset indent
-dcons "/usr/libexec/getty std.9600" vt100 on secure
+dcons "/usr/libexec/getty std.115200" vt100 on secure
.Ed
.Pp
Once the
Index: share/man/man5/remote.5
===================================================================
--- share/man/man5/remote.5
+++ share/man/man5/remote.5
@@ -92,7 +92,7 @@
When a modem is used, the data rate used to communicate
with the remote modem may be different than this rate.
This is a decimal number.
-The default rate is 9600 bits per second.
+The default rate is 115200 bits per second.
.It Cm \&cm
(str)
An initial connection message to be sent to the remote host.
Index: stand/defaults/loader.conf
===================================================================
--- stand/defaults/loader.conf
+++ stand/defaults/loader.conf
@@ -101,7 +101,7 @@
#kernels="kernel kernel.old" # Kernels to display in the boot menu
kernels_autodetect="YES" # Auto-detect kernel directories in /boot
#loader_logo="orbbw" # Desired logo: orbbw, orb, fbsdbw, beastiebw, beastie, none
-#comconsole_speed="9600" # Set the current serial console speed
+#comconsole_speed="115200" # Set the current serial console speed
#console="vidconsole" # A comma separated list of console(s)
#currdev="disk1s1a" # Set the current device
module_path="/boot/modules;/boot/dtb;/boot/dtb/overlays" # Set the module search path
Index: stand/defaults/loader.conf.5
===================================================================
--- stand/defaults/loader.conf.5
+++ stand/defaults/loader.conf.5
@@ -254,7 +254,7 @@
Name of the bitmap to be loaded.
Any other name can be used.
.It Va comconsole_speed
-.Dq ( 9600
+.Dq ( 115200
or the value of the
.Va BOOT_COMCONSOLE_SPEED
variable when
Index: stand/efi/loader/efiserialio.c
===================================================================
--- stand/efi/loader/efiserialio.c
+++ stand/efi/loader/efiserialio.c
@@ -41,7 +41,7 @@
#define COMC_TXWAIT 0x40000 /* transmit timeout */
#ifndef COMSPEED
-#define COMSPEED 9600
+#define COMSPEED 115200
#endif
#define PNP0501 0x501 /* 16550A-compatible COM port */
Index: stand/i386/boot0/Makefile
===================================================================
--- stand/i386/boot0/Makefile
+++ stand/i386/boot0/Makefile
@@ -55,7 +55,7 @@
# 2 stop bits (set = 2, clear = 1)
# 1-0 data bits (00 = 5, 01 = 6, 10 = 7, 11 = 8)
.if !defined(BOOT_BOOT0_COMCONSOLE_SPEED)
-BOOT_COMCONSOLE_SPEED?= 9600
+BOOT_COMCONSOLE_SPEED?= 9600 # XXX
.if ${BOOT_COMCONSOLE_SPEED} == 9600
BOOT_BOOT0_COMCONSOLE_SPEED= "7 << 5 + 3"
.elif ${BOOT_COMCONSOLE_SPEED} == 4800
Index: stand/i386/boot2/Makefile
===================================================================
--- stand/i386/boot2/Makefile
+++ stand/i386/boot2/Makefile
@@ -8,7 +8,7 @@
BOOT_BOOT1_FLAGS?= 0x80
BOOT_COMCONSOLE_PORT?= 0x3f8
-BOOT_COMCONSOLE_SPEED?= 9600
+BOOT_COMCONSOLE_SPEED?= 115200
B2SIOFMT?= 0x3
REL1= 0x700
Index: stand/i386/btx/btx/Makefile
===================================================================
--- stand/i386/btx/btx/Makefile
+++ stand/i386/btx/btx/Makefile
@@ -17,7 +17,7 @@
.if defined(BTX_SERIAL)
BOOT_COMCONSOLE_PORT?= 0x3f8
-BOOT_COMCONSOLE_SPEED?= 9600
+BOOT_COMCONSOLE_SPEED?= 115200
B2SIOFMT?= 0x3
CFLAGS+=-DBTX_SERIAL -DSIOPRT=${BOOT_COMCONSOLE_PORT} \
Index: stand/i386/gptboot/Makefile
===================================================================
--- stand/i386/gptboot/Makefile
+++ stand/i386/gptboot/Makefile
@@ -8,7 +8,7 @@
MAN= gptboot.8
BOOT_COMCONSOLE_PORT?= 0x3f8
-BOOT_COMCONSOLE_SPEED?= 9600
+BOOT_COMCONSOLE_SPEED?= 115200
B2SIOFMT?= 0x3
REL1= 0x700
Index: stand/i386/gptzfsboot/Makefile
===================================================================
--- stand/i386/gptzfsboot/Makefile
+++ stand/i386/gptzfsboot/Makefile
@@ -10,7 +10,7 @@
MAN= gptzfsboot.8
BOOT_COMCONSOLE_PORT?= 0x3f8
-BOOT_COMCONSOLE_SPEED?= 9600
+BOOT_COMCONSOLE_SPEED?= 115200
B2SIOFMT?= 0x3
REL1= 0x700
Index: stand/i386/isoboot/Makefile
===================================================================
--- stand/i386/isoboot/Makefile
+++ stand/i386/isoboot/Makefile
@@ -9,7 +9,7 @@
MAN= isoboot.8
BOOT_COMCONSOLE_PORT?= 0x3f8
-BOOT_COMCONSOLE_SPEED?= 9600
+BOOT_COMCONSOLE_SPEED?= 115200
B2SIOFMT?= 0x3
REL1= 0x700
Index: stand/i386/libi386/Makefile
===================================================================
--- stand/i386/libi386/Makefile
+++ stand/i386/libi386/Makefile
@@ -19,7 +19,7 @@
BOOT_COMCONSOLE_PORT?= 0x3f8
CFLAGS+= -DCOMPORT=${BOOT_COMCONSOLE_PORT}
-BOOT_COMCONSOLE_SPEED?= 9600
+BOOT_COMCONSOLE_SPEED?= 115200
CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED}
.ifdef(BOOT_BIOSDISK_DEBUG)
Index: stand/i386/libi386/comconsole.c
===================================================================
--- stand/i386/libi386/comconsole.c
+++ stand/i386/libi386/comconsole.c
@@ -42,7 +42,7 @@
#define COMPORT 0x3f8
#endif
#ifndef COMSPEED
-#define COMSPEED 9600
+#define COMSPEED 115200
#endif
static void comc_probe(struct console *cp);
Index: stand/i386/zfsboot/Makefile
===================================================================
--- stand/i386/zfsboot/Makefile
+++ stand/i386/zfsboot/Makefile
@@ -8,7 +8,7 @@
MAN= zfsboot.8
BOOT_COMCONSOLE_PORT?= 0x3f8
-BOOT_COMCONSOLE_SPEED?= 9600
+BOOT_COMCONSOLE_SPEED?= 115200
B2SIOFMT?= 0x3
REL1= 0x700
Index: stand/man/loader_simp.8
===================================================================
--- stand/man/loader_simp.8
+++ stand/man/loader_simp.8
@@ -360,7 +360,7 @@
If the previous boot stage indicated that a serial console is in use
then this variable is initialized to the current speed of the console
serial port.
-Otherwise it is set to 9600 unless this was overridden using the
+Otherwise it is set to 115200 unless this was overridden using the
.Va BOOT_COMCONSOLE_SPEED
variable when
.Nm
Index: sys/dev/usb/serial/umcs.c
===================================================================
--- sys/dev/usb/serial/umcs.c
+++ sys/dev/usb/serial/umcs.c
@@ -513,7 +513,7 @@
if (umcs7840_set_reg_sync(sc, umcs7840_port_registers[pn].reg_sp, data))
return;
- /* Set speed 9600 */
+ /* Set speed 9600 XXX */
if (umcs7840_set_baudrate(sc, pn, 9600))
return;
Index: sys/dev/usb/serial/usb_serial.c
===================================================================
--- sys/dev/usb/serial/usb_serial.c
+++ sys/dev/usb/serial/usb_serial.c
@@ -132,7 +132,7 @@
static int ucom_cons_unit = -1;
static int ucom_cons_subunit = 0;
-static int ucom_cons_baud = 9600;
+static int ucom_cons_baud = 115200;
static struct ucom_softc *ucom_cons_softc = NULL;
SYSCTL_INT(_hw_usb_ucom, OID_AUTO, cons_unit, CTLFLAG_RWTUN,
Index: tools/tools/nanobsd/rescue/Files/etc/ttys
===================================================================
--- tools/tools/nanobsd/rescue/Files/etc/ttys
+++ tools/tools/nanobsd/rescue/Files/etc/ttys
@@ -45,8 +45,8 @@
# Serial terminals
# The 'dialup' keyword identifies dialin lines to login, fingerd etc.
ttyu0 "/usr/libexec/getty std.115200" xterm-color on secure
-ttyu1 "/usr/libexec/getty std.9600" dialup off secure
-ttyu2 "/usr/libexec/getty std.9600" dialup off secure
-ttyu3 "/usr/libexec/getty std.9600" dialup off secure
+ttyu1 "/usr/libexec/getty std.115200" dialup off secure
+ttyu2 "/usr/libexec/getty std.115200" dialup off secure
+ttyu3 "/usr/libexec/getty std.115200" dialup off secure
# Dumb console
-dcons "/usr/libexec/getty std.9600" vt100 off secure
+dcons "/usr/libexec/getty std.115200" vt100 off secure
Index: usr.bin/fortune/datfiles/freebsd-tips
===================================================================
--- usr.bin/fortune/datfiles/freebsd-tips
+++ usr.bin/fortune/datfiles/freebsd-tips
@@ -833,7 +833,7 @@
To establish a serial connection to anything including a USB device,
nothing more than cu(1) is needed:
-$ cu -s 9600 -l /dev/ttyU0
+$ cu -s 115200 -l /dev/ttyU0
-- Daniel Ebdrup Jensen <debdrup@FreeBSD.org>
%
Index: usr.sbin/bhyve/uart_emul.c
===================================================================
--- usr.sbin/bhyve/uart_emul.c
+++ usr.sbin/bhyve/uart_emul.c
@@ -68,7 +68,7 @@
#define COM4_IRQ 3
#define DEFAULT_RCLK 1843200
-#define DEFAULT_BAUD 9600
+#define DEFAULT_BAUD 115200
#define FCR_RX_MASK 0xC0
Index: usr.sbin/boot0cfg/boot0cfg.8
===================================================================
--- usr.sbin/boot0cfg/boot0cfg.8
+++ usr.sbin/boot0cfg/boot0cfg.8
@@ -166,6 +166,7 @@
.Sq boot0
image
.It Pa /boot/boot0sio
+.\" XXX
Image for serial consoles (COM1,9600,8,N,1,MODEM)
.El
.Sh EXIT STATUS

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 23, 11:50 AM (7 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32025288
Default Alt Text
D36295.id114204.diff (11 KB)

Event Timeline