diff options
| author | Tim Marsland <Tim.Marsland@Sun.COM> | 2009-04-12 10:48:30 -0700 |
|---|---|---|
| committer | Tim Marsland <Tim.Marsland@Sun.COM> | 2009-04-12 10:48:30 -0700 |
| commit | de81e71e031139a0a7f13b7bf64152c3faa76698 (patch) | |
| tree | e4f1f70082c50c2d6545d118596050ee3e9adad7 /usr/src/cmd/ssh/libssh/common/ttymodes.c | |
| parent | 73cd555c10e70dac413ae4b40de8450a291750ac (diff) | |
| download | illumos-joyent-de81e71e031139a0a7f13b7bf64152c3faa76698.tar.gz | |
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
Diffstat (limited to 'usr/src/cmd/ssh/libssh/common/ttymodes.c')
| -rw-r--r-- | usr/src/cmd/ssh/libssh/common/ttymodes.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/usr/src/cmd/ssh/libssh/common/ttymodes.c b/usr/src/cmd/ssh/libssh/common/ttymodes.c index 1c27120481..b20ab34ff3 100644 --- a/usr/src/cmd/ssh/libssh/common/ttymodes.c +++ b/usr/src/cmd/ssh/libssh/common/ttymodes.c @@ -34,8 +34,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -49,8 +50,6 @@ #include "includes.h" RCSID("$OpenBSD: ttymodes.c,v 1.18 2002/06/19 00:27:55 deraadt Exp $"); -#pragma ident "%Z%%M% %I% %E% SMI" - #include "packet.h" #include "log.h" #include "ssh1.h" @@ -152,6 +151,14 @@ speed_to_baud(speed_t speed) case B230400: return 230400; #endif /* B230400 */ +#ifdef B460800 + case B460800: + return 460800; +#endif /* B460800 */ +#ifdef B921600 + case B921600: + return 921600; +#endif /* B921600 */ default: return 9600; } @@ -241,6 +248,14 @@ baud_to_speed(int baud) case 230400: return B230400; #endif /* B230400 */ +#ifdef B460800 + case 460800: + return B460800; +#endif /* B460800 */ +#ifdef B921600 + case 921600: + return B921600; +#endif /* B921600 */ default: return B9600; } |