summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/netutils/telnetd/telnetd_driver.c47
-rw-r--r--nuttx/ChangeLog3
-rw-r--r--nuttx/fs/fs_unregisterdriver.c6
-rwxr-xr-xnuttx/include/cxx/cstdlib9
-rw-r--r--nuttx/include/nuttx/tioctl.h62
-rw-r--r--nuttx/include/termios.h16
-rw-r--r--nuttx/lib/Makefile16
-rw-r--r--nuttx/lib/dirent/Make.defs40
-rw-r--r--nuttx/lib/dirent/lib_readdirr.c (renamed from nuttx/lib/misc/lib_readdirr.c)6
-rw-r--r--nuttx/lib/dirent/lib_telldir.c (renamed from nuttx/lib/misc/lib_telldir.c)8
-rw-r--r--nuttx/lib/misc/Make.defs5
-rw-r--r--nuttx/lib/termios/Make.defs40
-rw-r--r--nuttx/lib/termios/lib_tcgetattr.c93
-rw-r--r--nuttx/lib/termios/lib_tcsetattr.c122
14 files changed, 410 insertions, 63 deletions
diff --git a/apps/netutils/telnetd/telnetd_driver.c b/apps/netutils/telnetd/telnetd_driver.c
index 56a98a2f6..7d36e9d2d 100644
--- a/apps/netutils/telnetd/telnetd_driver.c
+++ b/apps/netutils/telnetd/telnetd_driver.c
@@ -72,6 +72,7 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
+/* Telnet protocol stuff ****************************************************/
#define ISO_nl 0x0a
#define ISO_cr 0x0d
@@ -82,6 +83,10 @@
#define TELNET_DO 253
#define TELNET_DONT 254
+/* Device stuff *************************************************************/
+
+#define TELNETD_DEVFMT "/dev/telnetd%d"
+
/****************************************************************************
* Private Types
****************************************************************************/
@@ -106,6 +111,7 @@ struct telnetd_dev_s
uint8_t td_pending; /* Number of valid, pending bytes in the rxbuffer */
uint8_t td_offset; /* Offset to the valid, pending bytes in the rxbuffer */
uint8_t td_crefs; /* The number of open references to the session */
+ int td_minor; /* Minor device number */
FAR struct socket td_psock; /* A clone of the internal socket structure */
char td_rxbuffer[CONFIG_TELNETD_RXBUFFER_SIZE];
char td_txbuffer[CONFIG_TELNETD_TXBUFFER_SIZE];
@@ -460,6 +466,7 @@ static int telnetd_close(FAR struct file *filep)
{
FAR struct inode *inode = filep->f_inode;
FAR struct telnetd_dev_s *priv = inode->i_private;
+ FAR char *devpath;
int ret;
nllvdbg("td_crefs: %d\n", priv->td_crefs);
@@ -479,15 +486,46 @@ static int telnetd_close(FAR struct file *filep)
if (priv->td_crefs > 1)
{
+ /* Just decrement the reference count and release the semaphore */
+
priv->td_crefs--;
sem_post(&priv->td_exclsem);
}
else
{
+ /* Re-create the path to the driver. */
+
+ sched_lock();
+ ret = asprintf(&devpath, TELNETD_DEVFMT, priv->td_minor);
+ if (ret < 0)
+ {
+ nlldbg("Failed to allocate the driver path\n");
+ }
+ else
+ {
+ /* Unregister the character driver */
+
+ ret = unregister_driver(devpath);
+ if (ret < 0)
+ {
+ nlldbg("Failed to unregister the driver %s: %d\n", ret);
+ }
+
+ free(devpath);
+ }
+
+ /* Close the socket */
+
psock_close(&priv->td_psock);
- sem_post(&priv->td_exclsem);
+
+ /* Release the driver memory. What if there are threads
+ * waiting on td_exclsem? They will never be awakened!
+ */
+
+ DEBUGASSERT(priv->td_exclsem.semcount == 0);
sem_destroy(&priv->td_exclsem);
free(priv);
+ sched_unlock();
}
ret = OK;
@@ -682,7 +720,6 @@ FAR char *telnetd_driver(int sd, FAR struct telnetd_s *daemon)
FAR struct telnetd_dev_s *priv;
FAR struct socket *psock;
FAR char *devpath = NULL;
- int minor;
int ret;
/* Allocate instance data for this driver */
@@ -736,13 +773,13 @@ FAR char *telnetd_driver(int sd, FAR struct telnetd_s *daemon)
}
while (ret < 0);
- minor = g_telnetdcommon.minor;
+ priv->td_minor = g_telnetdcommon.minor;
g_telnetdcommon.minor++;
sem_post(&g_telnetdcommon.exclsem);
/* Create a path and name for the driver. */
- ret = asprintf(&devpath, "/dev/telnetd%d", minor);
+ ret = asprintf(&devpath, TELNETD_DEVFMT, priv->td_minor);
if (ret < 0)
{
nlldbg("Failed to allocate the driver path\n");
@@ -754,7 +791,7 @@ FAR char *telnetd_driver(int sd, FAR struct telnetd_s *daemon)
ret = register_driver(devpath, &g_telnetdfops, 0666, priv);
if (ret < 0)
{
- nlldbg("Failed to register the driver %s: %d\n", ret);
+ nlldbg("Failed to register the driver %s: %d\n", devpath, ret);
goto errout_with_devpath;
}
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index e60b6689a..dbe87bb88 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -2422,3 +2422,6 @@
When drivers are closed, they may need to do things that require a fully
up-and-running task. Some things cannot be done later when the task is
crippled.
+ * lib/dirent: Moved readdir_r() and telldir() from lib/misc to this new
+ directory where they belong.
+ * lib/termios. Implemented tcsetattr() and tcgetattr().
diff --git a/nuttx/fs/fs_unregisterdriver.c b/nuttx/fs/fs_unregisterdriver.c
index 8370252dc..159816a6e 100644
--- a/nuttx/fs/fs_unregisterdriver.c
+++ b/nuttx/fs/fs_unregisterdriver.c
@@ -1,8 +1,8 @@
/****************************************************************************
* fs/fs_unregisterdriver.c
*
- * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2007-2009, 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
@@ -71,7 +71,7 @@
* Name: unregister_driver()
****************************************************************************/
-int unregister_driver(const char *path)
+int unregister_driver(FAR const char *path)
{
int ret;
inode_semtake();
diff --git a/nuttx/include/cxx/cstdlib b/nuttx/include/cxx/cstdlib
index 06bb10fc4..522f3fdb1 100755
--- a/nuttx/include/cxx/cstdlib
+++ b/nuttx/include/cxx/cstdlib
@@ -1,8 +1,8 @@
//***************************************************************************
// include/cxx/cstdlib
//
-// Copyright (C) 2009 Gregory Nutt. All rights reserved.
-// Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+// Copyright (C) 2009, 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
@@ -62,7 +62,12 @@ namespace std
using ::exit;
using ::abort;
+#ifdef CONFIG_SCHED_ATEXIT
using ::atexit;
+#endif
+#ifdef CONFIG_SCHED_ONEXIT
+ using ::on_exit;
+#endif
using ::strtol;
using ::strtod;
diff --git a/nuttx/include/nuttx/tioctl.h b/nuttx/include/nuttx/tioctl.h
index c45ebc0b1..9d5663b42 100644
--- a/nuttx/include/nuttx/tioctl.h
+++ b/nuttx/include/nuttx/tioctl.h
@@ -1,8 +1,8 @@
/********************************************************************************************
* include/nuttx/tioctl.h
*
- * 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
@@ -49,26 +49,26 @@
* Pre-Processor Definitions
********************************************************************************************/
- /* Get and Set Terminal Attributes */
+/* Get and Set Terminal Attributes */
-#define TCGETS _TIOC(0x0001) /* Get serial port settings: FAR struct termios* */
-#define TCSETS _TIOC(0x0002) /* Set serial port settings: FAR const struct termios* */
-#define TCSETSW _TIOC(0x0003) /* Drain output and set serial port settings: FAR const struct termios* */
-#define TCSETSF _TIOC(0x0004) /* Drain output, discard intput, and set serial port settings: FAR const struct termios* */
-#define TCGETA _TIOC(0x0005) /* See TCGETS: FAR struct termio* */
-#define TCSETA _TIOC(0x0006) /* See TCSETS: FAR const struct termio* */
-#define TCSETAW _TIOC(0x0007) /* See TCSETSF: FAR const struct termio* */
-#define TCSETAF _TIOC(0x0008) /* See TCSETSF: FAR const struct termio* */
+#define TCGETS _TIOC(0x0001) /* Get serial port settings: FAR struct termios */
+#define TCSETS _TIOC(0x0002) /* Set serial port settings: FAR const struct termios */
+#define TCSETSW _TIOC(0x0003) /* Drain output and set serial port settings: FAR const struct termios */
+#define TCSETSF _TIOC(0x0004) /* Drain output, discard intput, and set serial port settings: FAR const struct termios */
+#define TCGETA _TIOC(0x0005) /* See TCGETS: FAR struct termio */
+#define TCSETA _TIOC(0x0006) /* See TCSETS: FAR const struct termio */
+#define TCSETAW _TIOC(0x0007) /* See TCSETSF: FAR const struct termio */
+#define TCSETAF _TIOC(0x0008) /* See TCSETSF: FAR const struct termio */
/* Locking the termios structure */
-#define TIOCGLCKTRMIOS _TIOC(0x0009) /* Get termios lock status: struct termios* */
-#define TIOCSLCKTRMIOS _TIOC(0x000a) /* Set termios lock status: const struct termios* */
+#define TIOCGLCKTRMIOS _TIOC(0x0009) /* Get termios lock status: struct termios */
+#define TIOCSLCKTRMIOS _TIOC(0x000a) /* Set termios lock status: const struct termios */
/* Get and Set Window Size */
-#define TIOCGWINSZ _TIOC(0x000b) /* Get window size: FAR struct winsize* */
-#define TIOCSWINSZ _TIOC(0x000c) /* Set window size: FAR const struct winsize* */
+#define TIOCGWINSZ _TIOC(0x000b) /* Get window size: FAR struct winsize */
+#define TIOCSWINSZ _TIOC(0x000c) /* Set window size: FAR const struct winsize */
/* Send a break */
@@ -83,13 +83,13 @@
/* Buffer count and flushing */
-#define TIOCINQ _TIOC(0x0012) /* Bytes in input buffer: int* */
-#define TIOCOUTQ _TIOC(0x0013) /* Bytes in output buffer: int* */
+#define TIOCINQ _TIOC(0x0012) /* Bytes in input buffer: int */
+#define TIOCOUTQ _TIOC(0x0013) /* Bytes in output buffer: int */
#define TCFLSH _TIOC(0x0014) /* Flush: int */
/* Faking input */
-#define TIOCSTI _TIOC(0x0015) /* Insert into input: const char* */
+#define TIOCSTI _TIOC(0x0015) /* Insert into input: const char */
/* Re-directing console output */
@@ -107,12 +107,12 @@
/* Line discipline */
-#define TIOCGETD _TIOC(0x001b) /* Get line discipline: FAR int* */
-#define TIOCSETD _TIOC(0x001c) /* Set line discipline: FAR const int* */
+#define TIOCGETD _TIOC(0x001b) /* Get line discipline: FAR int */
+#define TIOCSETD _TIOC(0x001c) /* Set line discipline: FAR const int */
/* Packet mode */
-#define TIOCPKT _TIOC(0x001d) /* Control packet mode: FAR const int* */
+#define TIOCPKT _TIOC(0x001d) /* Control packet mode: FAR const int */
# define TIOCPKT_FLUSHREAD (1 << 0) /* The read queue for the terminal is flushed */
# define TIOCPKT_FLUSHWRITE (1 << 1) /* The write queue for the terminal is flushed */
@@ -123,10 +123,10 @@
/* Modem control */
-#define TIOCMGET _TIOC(0x001e) /* Get modem status bits: FAR int* */
-#define TIOCMSET _TIOC(0x001f) /* Set modem status bits: FAR const int* */
-#define TIOCMBIC _TIOC(0x0020) /* Clear modem bits: FAR const int* */
-#define TIOCMBIS _TIOC(0x0021) /* Set modem bits: FAR const int* */
+#define TIOCMGET _TIOC(0x001e) /* Get modem status bits: FAR int */
+#define TIOCMSET _TIOC(0x001f) /* Set modem status bits: FAR const int */
+#define TIOCMBIC _TIOC(0x0020) /* Clear modem bits: FAR const int */
+#define TIOCMBIS _TIOC(0x0021) /* Set modem bits: FAR const int */
# define TIOCM_LE (1 << 0) /* DSR (data set ready/line enable) */
# define TIOCM_DTR (1 << 1) /* DTR (data terminal ready) */
@@ -146,19 +146,19 @@
/* Marking a line as local */
-#define TIOCGSOFTCAR _TIOC(0x0023) /* Get software carrier flag: FAR int* */
-#define TIOCSSOFTCAR _TIOC(0x0024) /* Set software carrier flag: FAR const int* */
+#define TIOCGSOFTCAR _TIOC(0x0023) /* Get software carrier flag: FAR int */
+#define TIOCSSOFTCAR _TIOC(0x0024) /* Set software carrier flag: FAR const int */
/* Get/set serial line info */
-#define TIOCGSERIAL _TIOC(0x0025) /* Get serial line info: FAR struct serial_struct* */
-#define TIOCSSERIAL _TIOC(0x0026) /* Set serial line info: FAR const struct serial_struct* */
-#define TIOCSERGETLSR _TIOC(0x0027) /* Get line status register: FAR int* */
+#define TIOCGSERIAL _TIOC(0x0025) /* Get serial line info: FAR struct serial_struct */
+#define TIOCSSERIAL _TIOC(0x0026) /* Set serial line info: FAR const struct serial_struct */
+#define TIOCSERGETLSR _TIOC(0x0027) /* Get line status register: FAR int */
/* Serial events */
#define TIOCMIWAIT _TIOC(0x0028) /* Wait for a change on serial input line(s): void */
-#define TIOCGICOUNT _TIOC(0x0029) /* Read serial port interrupt count: FAR struct serial_icounter_struct* */
+#define TIOCGICOUNT _TIOC(0x0029) /* Read serial port interrupt count: FAR struct serial_icounter_struct */
/* Debugging */
diff --git a/nuttx/include/termios.h b/nuttx/include/termios.h
index 25ce61b40..ec2e77bea 100644
--- a/nuttx/include/termios.h
+++ b/nuttx/include/termios.h
@@ -1,8 +1,8 @@
/****************************************************************************
* include/termios.h
*
- * 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
@@ -216,17 +216,17 @@ extern "C" {
#define EXTERN extern
#endif
-EXTERN speed_t cfgetispeed(const struct termios *);
-EXTERN speed_t cfgetospeed(const struct termios *);
-EXTERN int cfsetispeed(struct termios *, speed_t);
-EXTERN int cfsetospeed(struct termios *, speed_t);
+EXTERN speed_t cfgetispeed(FAR const struct termios *);
+EXTERN speed_t cfgetospeed(FAR const struct termios *);
+EXTERN int cfsetispeed(FAR struct termios *, speed_t);
+EXTERN int cfsetospeed(FAR struct termios *, speed_t);
EXTERN int tcdrain(int);
EXTERN int tcflow(int, int);
EXTERN int tcflush(int, int);
-EXTERN int tcgetattr(int, struct termios *);
+EXTERN int tcgetattr(int, FAR struct termios *);
EXTERN pid_t tcgetsid(int);
EXTERN int tcsendbreak(int, int);
-EXTERN int tcsetattr(int, int, struct termios *);
+EXTERN int tcsetattr(int, int, FAR const struct termios *);
#undef EXTERN
#ifdef __cplusplus
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 01:48:25 +0000