[src/netbsd-9]: src Pull up following revision(s) (requested by kim in ticket...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/872b3963184b
branches:  netbsd-9
changeset: 936012:872b3963184b
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Jul 15 15:51:03 2020 +0000

description:
Pull up following revision(s) (requested by kim in ticket #1013):

        sys/arch/i386/stand/boot/boot2.c: revision 1.74
        share/man/man8/man8.x86/boot.8: revision 1.21

Let consdev command also set speed
Adapted from PR install/55490 by Sunil Nimmagadda

Document optional speed argument to consdev

diffstat:

 share/man/man8/man8.x86/boot.8   |  17 ++++++++++++++---
 sys/arch/i386/stand/boot/boot2.c |  30 ++++++++++++++++++++++++------
 2 files changed, 38 insertions(+), 9 deletions(-)

diffs (100 lines):

diff -r 2c75e37e7771 -r 872b3963184b share/man/man8/man8.x86/boot.8
--- a/share/man/man8/man8.x86/boot.8    Wed Jul 15 15:48:25 2020 +0000
+++ b/share/man/man8/man8.x86/boot.8    Wed Jul 15 15:51:03 2020 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: boot.8,v 1.15.2.3 2019/09/17 19:45:02 martin Exp $
+.\"    $NetBSD: boot.8,v 1.15.2.4 2020/07/15 15:51:03 martin Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"     @(#)boot_i386.8        8.2 (Berkeley) 4/19/94
 .\"
-.Dd August 18, 2019
+.Dd July 15, 2020
 .Dt BOOT 8 x86
 .Os
 .Sh NAME
@@ -363,7 +363,7 @@
 .Va boothowto .
 Boot the system in silent mode.
 .El
-.It Ic consdev Va dev
+.It Ic consdev Va dev Ns Oo Ns , Ns Va speed Oc
 Immediately switch the console to the specified device
 .Va dev
 and reprint the banner.
@@ -379,6 +379,17 @@
 .Sx Console Selection Policy
 in
 .Xr x86/boot_console 8 .
+.Pp
+A
+.Va speed
+for the serial port is optional and defaults to 9600.
+If a value of zero is specified, then the current baud rate (set by the
+BIOS) will be used.
+Setting the
+.Va speed
+with the
+.Ar pc
+device is not possible.
 .It Ic dev Op Va device
 Set the default drive and partition for subsequent file system
 operations.
diff -r 2c75e37e7771 -r 872b3963184b sys/arch/i386/stand/boot/boot2.c
--- a/sys/arch/i386/stand/boot/boot2.c  Wed Jul 15 15:48:25 2020 +0000
+++ b/sys/arch/i386/stand/boot/boot2.c  Wed Jul 15 15:51:03 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot2.c,v 1.70.8.1 2019/09/13 07:00:13 martin Exp $    */
+/*     $NetBSD: boot2.c,v 1.70.8.2 2020/07/15 15:51:03 martin Exp $    */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -443,7 +443,7 @@
               "ls [dev:][path]\n"
 #endif
               "dev [dev:]\n"
-              "consdev {pc|com[0123]|com[0123]kbd|auto}\n"
+              "consdev {pc|{com[0123]|com[0123]kbd|auto}[,{speed}]}\n"
               "vesa {modenum|on|off|enabled|disabled|list}\n"
 #ifndef SMALL
               "menu (reenters boot menu, if defined in boot.cfg)\n"
@@ -575,14 +575,32 @@
 command_consdev(char *arg)
 {
        const struct cons_devs *cdp;
+       char *sep;
+       int speed;
+
+       sep = strchr(arg, ',');
+       if (sep != NULL)
+               *sep++ = '\0';
 
        for (cdp = cons_devs; cdp->name; cdp++) {
-               if (strcmp(arg, cdp->name) == 0) {
-                       initio(cdp->tag);
-                       print_banner();
-                       return;
+               if (strcmp(arg, cdp->name) != 0)
+                       continue;
+
+               if (sep != NULL) {
+                       if (cdp->tag == CONSDEV_PC)
+                               goto error;
+
+                       speed = atoi(sep);
+                       if (speed < 0)
+                               goto error;
+                       boot_params.bp_conspeed = speed;
                }
+
+               initio(cdp->tag);
+               print_banner();
+               return;
        }
+error:
        printf("invalid console device.\n");
 }