summaryrefslogtreecommitdiff
path: root/nuttx/lib/misc
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-02-01 16:17:12 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-02-01 16:17:12 +0000
commit4b8f5a9e6dc87bad723af14933cb8c17284eade6 (patch)
treeb0014f9fe1675d05d8ee5d12f3c4128f7a59dbd2 /nuttx/lib/misc
parentd9e1bd9b855de8783076cddae7e17177d071a8b5 (diff)
downloadpx4-nuttx-4b8f5a9e6dc87bad723af14933cb8c17284eade6.tar.gz
px4-nuttx-4b8f5a9e6dc87bad723af14933cb8c17284eade6.tar.bz2
px4-nuttx-4b8f5a9e6dc87bad723af14933cb8c17284eade6.zip
Add tcsetattr and tcgetattr
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4355 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/lib/misc')
-rw-r--r--nuttx/lib/misc/Make.defs5
-rw-r--r--nuttx/lib/misc/lib_readdirr.c122
-rw-r--r--nuttx/lib/misc/lib_telldir.c91
3 files changed, 2 insertions, 216 deletions
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/misc/lib_readdirr.c b/nuttx/lib/misc/lib_readdirr.c
deleted file mode 100644
index 6a9af9068..000000000
--- a/nuttx/lib/misc/lib_readdirr.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
- * lib/misc/lib_readdirr.c
- *
- * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
- *
- * 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 <string.h>
-#include <dirent.h>
-#include <errno.h>
-
-#include <nuttx/fs.h>
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: readdir_r
- *
- * Description:
- * The readdir() function returns a pointer to a dirent
- * structure representing the next directory entry in the
- * directory stream pointed to by dir. It returns NULL on
- * reaching the end-of-file or if an error occurred.
- *
- * Inputs:
- * dirp -- An instance of type DIR created by a previous
- * call to opendir();
- * entry -- The storage pointed to by entry must be large
- * enough for a dirent with an array of char d_name
- * members containing at least {NAME_MAX}+1 elements.
- * result -- Upon successful return, the pointer returned
- * at *result shall have the same value as the
- * argument entry. Upon reaching the end of the directory
- * stream, this pointer shall have the value NULL.
- *
- * Return:
- * If successful, the readdir_r() function return s zero;
- * otherwise, an error number is returned to indicate the
- * error.
- *
- * EBADF - Invalid directory stream descriptor dir
- *
- ****************************************************************************/
-
-int readdir_r(FAR DIR *dirp, FAR struct dirent *entry,
- FAR struct dirent **result)
-{
- struct dirent *tmp;
-
- /* NOTE: The following use or errno is *not* thread-safe */
-
- set_errno(0);
- tmp = readdir(dirp);
- if (!tmp)
- {
- int error = get_errno();
- if (!error)
- {
- if (result)
- {
- *result = NULL;
- }
- return 0;
- }
- else
- {
- return error;
- }
- }
-
- if (entry)
- {
- memcpy(entry, tmp, sizeof(struct dirent));
- }
-
- if (result)
- {
- *result = entry;
- }
- return 0;
-}
-
diff --git a/nuttx/lib/misc/lib_telldir.c b/nuttx/lib/misc/lib_telldir.c
deleted file mode 100644
index 2fc5384bb..000000000
--- a/nuttx/lib/misc/lib_telldir.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
- * fs/fs_telldir.c
- *
- * Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
- *
- * 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/types.h>
-#include <dirent.h>
-#include <errno.h>
-
-#include <nuttx/fs.h>
-#include <nuttx/dirent.h>
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: telldir
- *
- * Description:
- * The telldir() function returns the current location
- * associated with the directory stream dirp.
- *
- * Inputs:
- * dirp -- An instance of type DIR created by a previous
- * call to opendir();
- *
- * Return:
- * On success, the telldir() function returns the current
- * location in the directory stream. On error, -1 is
- * returned, and errno is set appropriately.
- *
- * EBADF - Invalid directory stream descriptor dir
- *
- ****************************************************************************/
-
-off_t telldir(FAR DIR *dirp)
-{
- struct fs_dirent_s *idir = (struct fs_dirent_s *)dirp;
-
- if (!idir || !idir->fd_root)
- {
- *get_errno_ptr() = EBADF;
- return (off_t)-1;
- }
-
- /* Just return the current position */
-
- return idir->fd_position;
-}
-