6763764 Support for FTDI USB Serial adapters

6798921 usbser mishandles some ioctls
4696628 USB serial needs properties to ignore CD
6821751 Add support for 921600 baud

3 files changed, 18 insertions, 24 deletions

diff --git a/usr/src/lib/libcurses/screen/delay.c b/usr/src/lib/libcurses/screen/delay.c
index 2c6f50e662..fe570b9148 100644
--- a/usr/src/lib/libcurses/screen/delay.c
+++ b/usr/src/lib/libcurses/screen/delay.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 1997 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -37,8 +37,6 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*LINTLIBRARY*/
 
 #include	<sys/types.h>
@@ -55,10 +53,10 @@ static	short	tmspc10[] =
 			0, 2000, 1333, 909, 743, 666, 500, 333,
 		    /* 600 1200 1800 2400 4800 9600 19200 38400 baud */
 			166, 83,  55,  41,  20,  10,   5,    2,
-		    /* 57600, 76800, 115200, 153600, 230400 307200 baud */
+		    /* 57600, 76800, 115200, 153600, 230400, 307200 baud */
 			2,	1,	1,	1,	1,	1,
-		    /* 460800 baud */
-			1
+		    /* 460800, 921600 baud */
+			1,	1
 		};
 
 /*
diff --git a/usr/src/lib/libcurses/screen/newscreen.c b/usr/src/lib/libcurses/screen/newscreen.c
index 902c490088..ea5ec923c0 100644
--- a/usr/src/lib/libcurses/screen/newscreen.c
+++ b/usr/src/lib/libcurses/screen/newscreen.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -37,8 +37,6 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*LINTLIBRARY*/
 
 #include	<stdio.h>
@@ -55,7 +53,7 @@ extern	char	_endwin;
 static long    baud_convert[] = {
 		    1200, 50, 75, 110, 135, 150, 200, 300, 600, 1200,
 		    1800, 2400, 4800, 9600, 19200, 38400, 57600, 76800,
-		    115200, 153600, 230400, 307200, 460800
+		    115200, 153600, 230400, 307200, 460800, 921600
 		};
 
 static	char	isfilter = 0;
diff --git a/usr/src/lib/libnsl/dial/line.c b/usr/src/lib/libnsl/dial/line.c
index fd6378beca..08195abbbd 100644
--- a/usr/src/lib/libnsl/dial/line.c
+++ b/usr/src/lib/libnsl/dial/line.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -21,15 +20,13 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * This is a new line.c, which consists of line.c and culine.c
  * merged together.
@@ -71,6 +68,7 @@ static const struct sg_spds {
 	{230400, B230400},
 	{307200, B307200},
 	{460800, B460800},
+	{921600, B921600},
 	{0,    0}
 };
 
@@ -207,10 +205,10 @@ fixline(int tty, int spwant, int type)
 		for (i = 0; i < NCC; i++)
 			ttbuf.c_cc[i] = ttbufs.c_cc[i];
 		ASSERT((*Ioctl)(tty, TCSETAW, &ttbuf) >= 0,
-			"RETURN FROM fixline ioctl", "", errno);
+		    "RETURN FROM fixline ioctl", "", errno);
 	} else {
 		ASSERT((*Ioctl)(tty, TCSETSW, &ttbufs) >= 0,
-			"RETURN FROM fixline ioctl", "", errno);
+		    "RETURN FROM fixline ioctl", "", errno);
 	}
 }