Add tcsetattr and tcgetattr

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

8 files changed, 316 insertions, 14 deletions

diff --git a/nuttx/lib/Makefile b/nuttx/lib/Makefile
index eb39d868c..772c6f6a8 100644
--- a/nuttx/lib/Makefile
+++ b/nuttx/lib/Makefile
@@ -1,8 +1,8 @@
 ############################################################################
 # lib/Makefile
 #
-#   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2007-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
@@ -47,6 +47,8 @@ include math/Make.defs
 include net/Make.defs
 include time/Make.defs
 include libgen/Make.defs
+include dirent/Make.defs
+include termios/Make.defs
 include queue/Make.defs
 include misc/Make.defs
 
@@ -56,6 +58,7 @@ AOBJS = $(ASRCS:.S=$(OBJEXT))
 CSRCS = $(STDIO_SRCS) $(STDLIB_SRCS) $(UNISTD_SRCS)  $(SCHED_SRCS) \
 		  $(STRING_SRCS) $(PTHREAD_SRCS) $(SEM_SRCS) $(SIG_SRCS) $(MQUEUE_SRCS) \
 		  $(MATH_SRCS) $(NET_SRCS) $(TIME_SRCS) $(LIBGEN_SRCS) \
+		  $(DIRENT_SRCS) $(TERMIOS_SRCS) \
 		  $(QUEUE_SRCS) $(MISC_SRCS) $(REGEX_SRCS) $(CRC_SRCS) $(DBG_SRCS) 
 COBJS = $(CSRCS:.c=$(OBJEXT))
 
@@ -76,9 +79,13 @@ MATHDEPPATH = --dep-path math
 NETDEPPATH = --dep-path net
 TIMEDEPPATH = --dep-path time
 LIBGENDEPPATH = --dep-path libgen
+DIRENTDEPPATH = --dep-path dirent
+TERMIOSDEPPATH = --dep-path termios
 QUEUEDEPPATH = --dep-path queue
 MISCDEPPATH = --dep-path misc
-VPATH = stdio:stdlib:unistd:sched:string:pthread:semaphore:signal:mqueue:math:net:time:libgen:queue:misc
+
+VPATH  = stdio:stdlib:unistd:sched:string:pthread:semaphore:signal:mqueue
+VPATH += :math:net:time:libgen:dirent:termios:queue:misc
 
 UBIN = libulib$(LIBEXT)
 KBIN = libklib$(LIBEXT)
@@ -117,7 +124,8 @@ endif
 	@$(MKDEP) $(ROOTDEPPATH) $(STDIODEPPATH) $(STDLIBDEPPATH) \
 	  $(UNISTDDEPPATH) $(SCHEDDEPPATH) $(STRINGDEPPATH) $(PTHREADDEPPATH) \
 	  $(SEMDEPPATH) $(SIGDEPPATH) $(MQDEPPATH) $(MATHDEPPATH) $(NETDEPPATH)  \
-	  $(TIMEDEPPATH) $(LIBGENDEPPATH) $(QUEUEDEPPATH) $(MISCDEPPATH) \
+	  $(TIMEDEPPATH) $(LIBGENDEPPATH) $(DIRENTDEPPATH) $(TERMIOSDEPPATH) \
+	  $(QUEUEDEPPATH) $(MISCDEPPATH) \
 	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@
 
diff --git a/nuttx/lib/dirent/Make.defs b/nuttx/lib/dirent/Make.defs
new file mode 100644
index 000000000..d9dc8c29b
--- /dev/null
+++ b/nuttx/lib/dirent/Make.defs
@@ -0,0 +1,40 @@
+############################################################################
+# lib/dirent/Make.defs
+#
+#   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.
+#
+############################################################################
+
+DIRENT_SRCS = 
+ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
+DIRENT_SRCS += lib_readdirr.c lib_telldir.c
+endif
+
diff --git a/nuttx/lib/misc/lib_readdirr.c b/nuttx/lib/dirent/lib_readdirr.c
index 6a9af9068..59a32566d 100644
--- a/nuttx/lib/misc/lib_readdirr.c
+++ b/nuttx/lib/dirent/lib_readdirr.c
@@ -1,8 +1,8 @@
 /****************************************************************************
- * lib/misc/lib_readdirr.c
+ * lib/dirent/lib_readdirr.c
  *
- *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2009, 2011-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
diff --git a/nuttx/lib/misc/lib_telldir.c b/nuttx/lib/dirent/lib_telldir.c
index 2fc5384bb..5bc9a5fed 100644
--- a/nuttx/lib/misc/lib_telldir.c
+++ b/nuttx/lib/dirent/lib_telldir.c
@@ -1,8 +1,8 @@
 /****************************************************************************
- * fs/fs_telldir.c
+ * lib/dirent/fs_telldir.c
  *
- *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2008, 2011-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
@@ -80,7 +80,7 @@ off_t telldir(FAR DIR *dirp)
 
   if (!idir || !idir->fd_root)
     {
-      *get_errno_ptr() = EBADF;
+      set_errno(EBADF);
       return (off_t)-1;
     }
 
diff --git a/nuttx/lib/misc/Make.defs b/nuttx/lib/misc/Make.defs
index 62443c338..8892f71e6 100644
--- a/nuttx/lib/misc/Make.defs
+++ b/nuttx/lib/misc/Make.defs
@@ -1,8 +1,8 @@
 ############################################################################
 # lib/misc/Make.defs
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2011-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
@@ -36,7 +36,6 @@
 MISC_SRCS = lib_init.c lib_filesem.c
 
 ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
-MISC_SRCS += lib_readdirr.c lib_telldir.c
 ifneq ($(CONFIG_NFILE_STREAMS),0)
 MISC_SRCS += lib_streamsem.c
 endif
diff --git a/nuttx/lib/termios/Make.defs b/nuttx/lib/termios/Make.defs
new file mode 100644
index 000000000..0ad3b5c3a
--- /dev/null
+++ b/nuttx/lib/termios/Make.defs
@@ -0,0 +1,40 @@
+############################################################################
+# lib/misc/Make.defs
+#
+#   Copyright (C) 2011-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.
+#
+############################################################################
+
+TERMIOS_SRCS =
+
+ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
+TERMIOS_SRCS += lib_tcgetattr.c lib_tcsetattr.c
+endif
diff --git a/nuttx/lib/termios/lib_tcgetattr.c b/nuttx/lib/termios/lib_tcgetattr.c
new file mode 100644
index 000000000..a267b3f2f
--- /dev/null
+++ b/nuttx/lib/termios/lib_tcgetattr.c
@@ -0,0 +1,93 @@
+/****************************************************************************
+ * lib/termios/lib_tcgetattr.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/ioctl.h>
+
+#include <termios.h>
+#include <errno.h>
+
+#include <nuttx/tioctl.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: tcgetattr
+ *
+ * Descripton:
+ *   The tcgetattr() function gets the parameters associated with the
+ *   terminal referred to by 'fd' and stores them in the termios structure
+ *   referenced by 'termiosp'.
+ *
+ * Input Parameters:
+ *   fd - The 'fd' argument is an open file descriptor associated with a terminal.
+ *   termiosp - The termiosp argument is a pointer to a termios structure.
+ *
+ * Returned Value:
+ *   Upon successful completion, 0 is returned. Otherwise, -1 is returned and
+ *   errno is set to indicate the error.  The following errors may be reported:
+ *
+ *   - EBADF: The 'fd' argument is not a valid file descriptor. 
+ *   - ENOTTY: The file associated with 'fd' is not a terminal. 
+ *
+ ****************************************************************************/
+
+int tcgetattr(int fd, FAR struct termios *termiosp)
+{
+  return ioctl(fd, TCGETS, (unsigned long)termiosp);
+}
diff --git a/nuttx/lib/termios/lib_tcsetattr.c b/nuttx/lib/termios/lib_tcsetattr.c
new file mode 100644
index 000000000..636fd3461
--- /dev/null
+++ b/nuttx/lib/termios/lib_tcsetattr.c
@@ -0,0 +1,122 @@
+/****************************************************************************
+ * lib/termios/lib_tcsetattr.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/ioctl.h>
+
+#include <termios.h>
+#include <errno.h>
+
+#include <nuttx/tioctl.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: tcsetattr
+ *
+ * Descripton:
+ *   The tcsetattr() function sets the parameters associated with the
+ *   terminal referred to by the open file descriptor 'fd' from the termios
+ *   structure referenced by 'termiop' as follows:
+ *
+ *   If 'options' is TCSANOW, the change will occur immediately.
+ *
+ *   If 'options' is TCSADRAIN, the change will occur after all output
+ *   written to 'fd' is transmitted. This function should be used when changing
+ *   parameters that affect output.
+ *
+ *   If 'options' is TCSAFLUSH, the change will occur after all
+ *   output written to 'fd' is transmitted, and all input so far received but
+ *   not read will be discarded before the change is made.
+ *
+ *   The tcsetattr() function will return successfully if it was able to
+ *   perform any of the requested actions, even if some of the requested
+ *   actions could not be performed. It will set all the attributes that
+ *   implementation supports as requested and leave all the attributes not
+ *   supported by the implementation unchanged. If no part of the request
+ *   can be honoured, it will return -1 and set errno to EINVAL.
+ *
+ *   The effect of tcsetattr() is undefined if the value of the termios
+ *   structure pointed to by 'termiop' was not derived from the result of
+ *   a call to tcgetattr() on 'fd'; an application should modify only fields
+ *   and flags defined by this specification between the call to tcgetattr()
+ *   and tcsetattr(), leaving all other fields and flags unmodified.
+ *
+ * Returned Value:
+ *
+ *   Upon successful completion, 0 is returned. Otherwise, -1 is returned
+ *   and errno is set to indicate the error.  The following errors may be
+ *   reported:
+ *
+ *   - EBADF: The 'fd' argument is not a valid file descriptor. 
+ *   - EINTR:  A signal interrupted tcsetattr(). 
+ *   - EINVAL: The 'options' argument is not a supported value, or
+ *     an attempt was made to change an attribute represented in the
+ *     termios structure to an unsupported value. 
+ *   - ENOTTY: The file associated with 'fd' is not a terminal. 
+ *
+ ****************************************************************************/
+
+int tcsetattr(int fd, int options, FAR const struct termios *termiosp)
+{
+  if (options == TCSANOW)
+    {
+      return ioctl(fd, TCSETS, (unsigned long)termiosp);
+    }
+  return -ENOSYS;
+}
\ No newline at end of file