Loosen up termios interfaces to allow more flexible baud settings; remove AIX-like interfaces of last check-in

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4969 7fd9a85b-ad96-42d3-883c-3090e2eb8679

1 files changed, 34 insertions, 40 deletions

diff --git a/nuttx/include/nuttx/serial/tioctl.h b/nuttx/include/nuttx/serial/tioctl.h
index 6862d74539..b309ff37ce 100644
--- a/nuttx/include/nuttx/serial/tioctl.h
+++ b/nuttx/include/nuttx/serial/tioctl.h
@@ -65,60 +65,54 @@
 #define TIOCGLCKTRMIOS  _TIOC(0x0009) /* Get termios lock status: FAR struct termios* */
 #define TIOCSLCKTRMIOS  _TIOC(0x000a) /* Set termios lock status: FAR const struct termios* */
 
-/* Support for AIX-style get_speed, set_speed, and reset_speed operations (see sys/str_tty.h) */
-
-#define TIOCSETSPEED    _TIOC(0x000b)  /* Set speed, enter extended speed mode: int32_t */
-#define TIOCGETSPEED    _TIOC(0x000c)  /* Get speed: int32_t* */
-#define TIOCRESETSPEED  _TIOC(0x000d)  /* Exit extended speed mode: None */
-
 /* Get and Set Window Size */
 
-#define TIOCGWINSZ      _TIOC(0x000e) /* Get window size: FAR struct winsize */
-#define TIOCSWINSZ      _TIOC(0x000f) /* 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 */
 
-#define TCSBRK          _TIOC(0x0010)  /* Send a break: int */
-#define TCSBRKP         _TIOC(0x0011)  /* Send a POSIX break: int */
-#define TIOCSBRK        _TIOC(0x0012)  /* Turn break on: void */
-#define TIOCCBRK        _TIOC(0x0013)  /* Turn break off: void */
+#define TCSBRK          _TIOC(0x000d)  /* Send a break: int */
+#define TCSBRKP         _TIOC(0x000e)  /* Send a POSIX break: int */
+#define TIOCSBRK        _TIOC(0x000f)  /* Turn break on: void */
+#define TIOCCBRK        _TIOC(0x0010)  /* Turn break off: void */
 
 /* Software flow control */
 
-#define TCXONC          _TIOC(0x0014)  /* Control flow control: int */
+#define TCXONC          _TIOC(0x0011)  /* Control flow control: int */
 
 /* Buffer count and flushing */
 
-#define TIOCINQ         _TIOC(0x0015)  /* Bytes in input buffer: int */
-#define TIOCOUTQ        _TIOC(0x0016)  /* Bytes in output buffer: int */
-#define TCFLSH          _TIOC(0x0017)  /* Flush: 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(0x0018)  /* Insert into input: const char */
+#define TIOCSTI         _TIOC(0x0015)  /* Insert into input: const char */
 
 /* Re-directing console output */
 
-#define TIOCCONS        _TIOC(0x0019)  /* Re-direct console output to device: void */
+#define TIOCCONS        _TIOC(0x0016)  /* Re-direct console output to device: void */
 
 /* Controlling TTY */
 
-#define TIOCSCTTY       _TIOC(0x001a)  /* Make controlling TTY: int */
-#define TIOCNOTTY       _TIOC(0x001b)  /* Give up controllinog TTY: void */
+#define TIOCSCTTY       _TIOC(0x0017)  /* Make controlling TTY: int */
+#define TIOCNOTTY       _TIOC(0x0018)  /* Give up controllinog TTY: void */
 
 /* Exclusive mode */
 
-#define TIOCEXCL        _TIOC(0x001c)  /* Put TTY in exclusive mode: void */
-#define TIOCNXCL        _TIOC(0x001d)  /* Disable exclusive mode: void */
+#define TIOCEXCL        _TIOC(0x0019)  /* Put TTY in exclusive mode: void */
+#define TIOCNXCL        _TIOC(0x001a)  /* Disable exclusive mode: void */
 
 /* Line discipline */
 
-#define TIOCGETD        _TIOC(0x001e)  /* Get line discipline: FAR int */
-#define TIOCSETD        _TIOC(0x001f)  /* 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(0x0020)  /* 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 */
@@ -129,10 +123,10 @@
 
 /* Modem control */
 
-#define TIOCMGET        _TIOC(0x0021)  /* Get modem status bits: FAR int */
-#define TIOCMSET        _TIOC(0x0022)  /* Set modem status bits: FAR const int */
-#define TIOCMBIC        _TIOC(0x0023)  /* Clear modem bits: FAR const int */
-#define TIOCMBIS        _TIOC(0x0024)  /* 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) */
@@ -148,32 +142,32 @@
 
 /* TTY shutdown */
 
-#define TIOCVHANGUP     _TIOC(0x0025)  /* Shutdown TTY: void */
+#define TIOCVHANGUP     _TIOC(0x0022)  /* Shutdown TTY: void */
 
 /* Marking a line as local */
 
-#define TIOCGSOFTCAR    _TIOC(0x0026)  /* Get software carrier flag: FAR int */
-#define TIOCSSOFTCAR    _TIOC(0x0027)  /* 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(0x0028)  /* Get serial line info: FAR struct serial_struct */
-#define TIOCSSERIAL     _TIOC(0x0029)  /* Set serial line info: FAR const struct serial_struct */
-#define TIOCSERGETLSR   _TIOC(0x002a)  /* 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(0x002b)  /* Wait for a change on serial input line(s): void */
-#define TIOCGICOUNT     _TIOC(0x002c)  /* Read serial port interrupt count: FAR  struct serial_icounter_struct */
+#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 */
 
 /* RS-485 Support */
 
-#define TIOCSRS485      _TIOC(0x002d)  /* Set RS485 mode, arg: pointer to struct serial_rs485 */
-#define TIOCGRS485      _TIOC(0x002e)  /* Get RS485 mode, arg: pointer to struct serial_rs485 */
+#define TIOCSRS485      _TIOC(0x002a)  /* Set RS485 mode, arg: pointer to struct serial_rs485 */
+#define TIOCGRS485      _TIOC(0x002b)  /* Get RS485 mode, arg: pointer to struct serial_rs485 */
 
 /* Debugging */
 
-#define TIOCSERGSTRUCT  _TIOC(0x002f) /* Get device TTY structure */
+#define TIOCSERGSTRUCT  _TIOC(0x002c) /* Get device TTY structure */
 
 /* Definitions used in struct serial_rs485 (Linux compatible) */