13975 support for higher baud rates

Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Approved by: Richard Lowe <richlowe@richlowe.net>

3 files changed, 62 insertions, 46 deletions

diff --git a/usr/src/ucbcmd/stty/stty.c b/usr/src/ucbcmd/stty/stty.c
index 127a118c78..2914d913aa 100644
--- a/usr/src/ucbcmd/stty/stty.c
+++ b/usr/src/ucbcmd/stty/stty.c
@@ -755,10 +755,12 @@ delay(int m, char *s)
 		(void) fprintf(output, "%s%d ", s, m);
 }
 
-long	speed[] = {
+long speed[] = {
 	0, 50, 75, 110, 134, 150, 200, 300,
 	600, 1200, 1800, 2400, 4800, 9600, 19200, 38400,
-	57600, 76800, 115200, 153600, 230400, 307200, 460800, 921600
+	57600, 76800, 115200, 153600, 230400, 307200, 460800, 921600,
+	1000000, 1152000, 1500000, 2000000, 2500000, 3000000, 3500000,
+	4000000
 };
 
 void
diff --git a/usr/src/ucbcmd/stty/sttytable.c b/usr/src/ucbcmd/stty/sttytable.c
index 1544f42fb8..165fdf4bab 100644
--- a/usr/src/ucbcmd/stty/sttytable.c
+++ b/usr/src/ucbcmd/stty/sttytable.c
@@ -36,21 +36,21 @@
 #include "stty.h"
 
 const struct	speeds speeds[] = {
-	"0",	B0,
-	"50",	B50,
-	"75",	B75,
-	"110",	B110,
-	"134",	B134,
-	"134.5", B134,
-	"150",	B150,
-	"200",	B200,
-	"300",	B300,
-	"600",	B600,
-	"1200",	B1200,
-	"1800",	B1800,
-	"2400",	B2400,
-	"4800",	B4800,
-	"9600",	B9600,
+	"0",		B0,
+	"50",		B50,
+	"75",		B75,
+	"110",		B110,
+	"134",		B134,
+	"134.5",	B134,
+	"150",		B150,
+	"200",		B200,
+	"300",		B300,
+	"600",		B600,
+	"1200",		B1200,
+	"1800",		B1800,
+	"2400",		B2400,
+	"4800",		B4800,
+	"9600",		B9600,
 	"19200",	B19200,
 	"19.2",		B19200,
 	"exta",		EXTA,
@@ -65,6 +65,14 @@ const struct	speeds speeds[] = {
 	"307200",	B307200,
 	"460800",	B460800,
 	"921600",	B921600,
+	"1000000",	B1000000,
+	"1152000",	B1152000,
+	"1500000",	B1500000,
+	"2000000",	B2000000,
+	"2500000",	B2500000,
+	"3000000",	B3000000,
+	"3500000",	B3500000,
+	"4000000",	B4000000,
 	0,
 };
 						/* Control Modes */
diff --git a/usr/src/ucbcmd/tset/tset.c b/usr/src/ucbcmd/tset/tset.c
index b6cdeb223b..9054fe44ad 100644
--- a/usr/src/ucbcmd/tset/tset.c
+++ b/usr/src/ucbcmd/tset/tset.c
@@ -348,39 +348,45 @@ struct	map {
 
 struct map *Map = map;
 
-/* This should be available in an include file */
-struct
-{
+struct {
 	char	*string;
 	int	speed;
 	int	baudrate;
 } speeds[] = {
-	"0",	B0,	0,
-	"50",	B50,	50,
-	"75",	B75,	75,
-	"110",	B110,	110,
-	"134",	B134,	134,
-	"134.5", B134,	134,
-	"150",	B150,	150,
-	"200",	B200,	200,
-	"300",	B300,	300,
-	"600",	B600,	600,
-	"1200",	B1200,	1200,
-	"1800",	B1800,	1800,
-	"2400",	B2400,	2400,
-	"4800",	B4800,	4800,
-	"9600",	B9600,	9600,
-	"19200", EXTA,	19200,
-	"exta",	EXTA,	19200,
-	"extb",	EXTB,	38400,
-	"57600", B57600,	57600,
-	"76800", B76800,	76800,
-	"115200", B115200, 115200,
-	"153600", B153600, 153600,
-	"230400", B230400, 230400,
-	"307200", B307200, 307200,
-	"460800", B460800, 460800,
-	"921600", B921600, 921600,
+	"0",		B0,		0,
+	"50",		B50,		50,
+	"75",		B75,		75,
+	"110",		B110,		110,
+	"134",		B134,		134,
+	"134.5",	B134,		134,
+	"150",		B150,		150,
+	"200",		B200,		200,
+	"300",		B300,		300,
+	"600",		B600,		600,
+	"1200",		B1200,		1200,
+	"1800",		B1800,		1800,
+	"2400",		B2400,		2400,
+	"4800",		B4800,		4800,
+	"9600",		B9600,		9600,
+	"19200",	EXTA,		19200,
+	"exta",		EXTA,		19200,
+	"extb",		EXTB,		38400,
+	"57600",	B57600,		57600,
+	"76800",	B76800,		76800,
+	"115200",	B115200,	115200,
+	"153600",	B153600,	153600,
+	"230400",	B230400,	230400,
+	"307200",	B307200,	307200,
+	"460800",	B460800,	460800,
+	"921600",	B921600,	921600,
+	"1000000",	B1000000,	1000000,
+	"1152000",	B1152000,	1152000,
+	"1500000",	B1500000,	1500000,
+	"2000000",	B2000000,	2000000,
+	"2500000",	B2500000,	2500000,
+	"3000000",	B3000000,	3000000,
+	"3500000",	B3500000,	3500000,
+	"4000000",	B4000000,	4000000,
 	0,
 };