Add support for extended BAUD settings

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4967 42af7a65-404d-4744-a932-0658087f49c3

5 files changed, 345 insertions, 2 deletions

diff --git a/nuttx/lib/termios/Make.defs b/nuttx/lib/termios/Make.defs
index 645b6459d..b16231004 100644
--- a/nuttx/lib/termios/Make.defs
+++ b/nuttx/lib/termios/Make.defs
@@ -36,7 +36,15 @@
 TERMIOS_SRCS =
 
 ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
+
+# POSIX standard interfaces
+
 TERMIOS_SRCS += lib_cfgetispeed.c lib_cfgetospeed.c lib_cfsetispeed.c
 TERMIOS_SRCS += lib_cfsetospeed.c lib_tcflush.c lib_tcgetattr.c
 TERMIOS_SRCS += lib_tcsetattr.c
+
+# Non-standard AIX-like interfaces
+
+TERMIOS_SRCS += lib_getspeed.c lib_resetspeed.c lib_setspeed.c
+
 endif
diff --git a/nuttx/lib/termios/lib_getspeed.c b/nuttx/lib/termios/lib_getspeed.c
new file mode 100644
index 000000000..dbc3686b3
--- /dev/null
+++ b/nuttx/lib/termios/lib_getspeed.c
@@ -0,0 +1,118 @@
+/****************************************************************************
+ * lib/termios/lib_getspeed.c
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/str_tty.h>
+#include <sys/ioctl.h>
+
+#include <nuttx/serial/tioctl.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: get_speed
+ *
+ * Descripton:
+ *   set_speed(), get_speed(), and reset_speed are non-standard AIX-like
+ *   interfaces to simplify TTY baud rate operations.
+ *
+ *   The baud rate functions set_speed() and get_speed() are provided to
+ *   allow the applications to program any value of the baud rate that is
+ *   supported by the serial driver, but that cannot be expressed using
+ *   the termios subroutines cfsetospeed, cfsetispeed, cfgetospeed,
+ *   and cfsgetispeed. Those subroutines are limited to the set of values
+ *   defined termios.h.
+ *
+ *   Normal mode: This is the default mode, in which a termios supported
+ *   speed is in use.
+ *
+ *   Speed-extended mode: This mode is entered by calling set_speed() with
+ *   a non-termios supported speed at the configuration of the line. In this
+ *   mode, all the calls to tcgetattr subroutine or TCGETS ioctl subroutine
+ *   will have B50 in the returned termios structure.
+ *
+ *   If tcsetattr() or TCSETS, TCSETAF, or TCSETAW ioctl calls the driver
+ *   and attempts to set B50, the actual baud rate is not changed. If it
+ *   attempts to set any other termios-supported speed, will switch back
+ *   to the normal mode and the requested baud rate is set.  Calling
+ *   reset_speed subroutine is another way to switch back to the
+ *  normal mode.
+ *
+ * Input Parameters:
+ *   fd  - The 'fd' argument is an open file descriptor associated with a
+ *         terminal.
+ *
+ * Returned Value:
+ *   Upon successful completion, the extended baud is returned. Otherwise,
+ *   -1 is returned and errno is set to indicate the error.
+ *
+ ****************************************************************************/
+
+int32_t get_speed(int fd)
+{
+  int32_t speed;
+  int ret;
+
+  ret = ioctl(fd, TIOCGETSPEED, (unsigned long)((uintptr_t)&speed));
+  if (ret < 0)
+    {
+      return (int32_t)ret;
+    }
+ 
+  return speed;
+}
diff --git a/nuttx/lib/termios/lib_resetspeed.c b/nuttx/lib/termios/lib_resetspeed.c
new file mode 100644
index 000000000..8da9cdc78
--- /dev/null
+++ b/nuttx/lib/termios/lib_resetspeed.c
@@ -0,0 +1,109 @@
+/****************************************************************************
+ * lib/termios/lib_resetspeed.c
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/str_tty.h>
+#include <sys/ioctl.h>
+
+#include <nuttx/serial/tioctl.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: reset_speed
+ *
+ * Descripton:
+ *   set_speed(), get_speed(), and reset_speed are non-standard AIX-like
+ *   interfaces to simplify TTY baud rate operations.
+ *
+ *   The baud rate functions set_speed() and get_speed() are provided to
+ *   allow the applications to program any value of the baud rate that is
+ *   supported by the serial driver, but that cannot be expressed using
+ *   the termios subroutines cfsetospeed, cfsetispeed, cfgetospeed,
+ *   and cfsgetispeed. Those subroutines are limited to the set of values
+ *   defined termios.h.
+ *
+ *   Normal mode: This is the default mode, in which a termios supported
+ *   speed is in use.
+ *
+ *   Speed-extended mode: This mode is entered by calling set_speed() with
+ *   a non-termios supported speed at the configuration of the line. In this
+ *   mode, all the calls to tcgetattr subroutine or TCGETS ioctl subroutine
+ *   will have B50 in the returned termios structure.
+ *
+ *   If tcsetattr() or TCSETS, TCSETAF, or TCSETAW ioctl calls the driver
+ *   and attempts to set B50, the actual baud rate is not changed. If it
+ *   attempts to set any other termios-supported speed, will switch back
+ *   to the normal mode and the requested baud rate is set.  Calling
+ *   reset_speed subroutine is another way to switch back to the
+ *  normal mode.
+ *
+ * Input Parameters:
+ *   fd  - The 'fd' argument is an open file descriptor associated with a terminal.
+ *   cmd - The TCFLSH ioctl argument.
+ *
+ * Returned Value:
+ *   Upon successful completion, 0 is returned. Otherwise, -1 is returned and
+ *   errno is set to indicate the error.
+ *
+ ****************************************************************************/
+
+int reset_speed(int fd)
+{
+  return ioctl(fd, TIOCRESETSPEED, 0L);
+}
diff --git a/nuttx/lib/termios/lib_setspeed.c b/nuttx/lib/termios/lib_setspeed.c
new file mode 100644
index 000000000..13a0cc57a
--- /dev/null
+++ b/nuttx/lib/termios/lib_setspeed.c
@@ -0,0 +1,110 @@
+/****************************************************************************
+ * lib/termios/lib_setspeed.c
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/str_tty.h>
+#include <sys/ioctl.h>
+
+#include <nuttx/serial/tioctl.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: set_speed
+ *
+ * Descripton:
+ *   set_speed(), get_speed(), and reset_speed are non-standard AIX-like
+ *   interfaces to simplify TTY baud rate operations.
+ *
+ *   The baud rate functions set_speed() and get_speed() are provided to
+ *   allow the applications to program any value of the baud rate that is
+ *   supported by the serial driver, but that cannot be expressed using
+ *   the termios subroutines cfsetospeed, cfsetispeed, cfgetospeed,
+ *   and cfsgetispeed. Those subroutines are limited to the set of values
+ *   defined termios.h.
+ *
+ *   Normal mode: This is the default mode, in which a termios supported
+ *   speed is in use.
+ *
+ *   Speed-extended mode: This mode is entered by calling set_speed() with
+ *   a non-termios supported speed at the configuration of the line. In this
+ *   mode, all the calls to tcgetattr subroutine or TCGETS ioctl subroutine
+ *   will have B50 in the returned termios structure.
+ *
+ *   If tcsetattr() or TCSETS, TCSETAF, or TCSETAW ioctl calls the driver
+ *   and attempts to set B50, the actual baud rate is not changed. If it
+ *   attempts to set any other termios-supported speed, will switch back
+ *   to the normal mode and the requested baud rate is set.  Calling
+ *   reset_speed subroutine is another way to switch back to the
+ *  normal mode.
+ *
+ * Input Parameters:
+ *   fd  - The 'fd' argument is an open file descriptor associated with a
+ *         terminal.
+ *   speed - The new, extended baud
+ *
+ * Returned Value:
+ *   Upon successful completion, 0 is returned. Otherwise, -1 is returned and
+ *   errno is set to indicate the error.
+ *
+ ****************************************************************************/
+
+int set_speed(int fd, int32_t speed)
+{
+  return ioctl(fd, TIOCSETSPEED, (unsigned long)speed);
+}
diff --git a/nuttx/lib/termios/lib_tcflush.c b/nuttx/lib/termios/lib_tcflush.c
index abe3b936b..338524bdd 100644
--- a/nuttx/lib/termios/lib_tcflush.c
+++ b/nuttx/lib/termios/lib_tcflush.c
@@ -84,7 +84,5 @@
 
 int tcflush(int fd, int cmd)
 {
-  /* Not yet implemented */
-
   return ioctl(fd, TCFLSH, (unsigned long)cmd);
 }