From 93531e9b08b2c641abc4bf5e53c5ebcd754c7d55 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 6 Jun 2017 08:03:45 +0200 Subject: Move RTEMS-specific Termios API content Remove obsolete support for OFILL, OFDEL, NLDLY, CRDLY, BSDLY, VTDLY, and FFDLY which is not present on FreeBSD and not implemented in Linux. Update #2833. --- cpukit/libcsupport/include/rtems/termiostypes.h | 9 ++++++++ cpukit/libcsupport/include/sys/_termios.h | 28 ------------------------- cpukit/libcsupport/include/sys/ttycom.h | 4 ---- cpukit/libcsupport/src/termios.c | 4 ++-- 4 files changed, 11 insertions(+), 34 deletions(-) (limited to 'cpukit/libcsupport') diff --git a/cpukit/libcsupport/include/rtems/termiostypes.h b/cpukit/libcsupport/include/rtems/termiostypes.h index 1140c6162d..e91faa7376 100644 --- a/cpukit/libcsupport/include/rtems/termiostypes.h +++ b/cpukit/libcsupport/include/rtems/termiostypes.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -573,6 +574,14 @@ int rtems_termios_poll( int events ); +#define RTEMS_IO_SNDWAKEUP _IOW('t', 11, struct ttywakeup ) /* send tty wakeup */ +#define RTEMS_IO_RCVWAKEUP _IOW('t', 12, struct ttywakeup ) /* recv tty wakeup */ + +#define OLCUC 0x00000100 /* map lower case to upper case on output */ +#define IUCLC 0x00004000 /* map upper case to lower case on input */ + +#define RTEMS_TERMIOS_NUMBER_BAUD_RATES 25 + #ifdef __cplusplus } #endif diff --git a/cpukit/libcsupport/include/sys/_termios.h b/cpukit/libcsupport/include/sys/_termios.h index 32d9b2481c..1eca7cafee 100644 --- a/cpukit/libcsupport/include/sys/_termios.h +++ b/cpukit/libcsupport/include/sys/_termios.h @@ -95,9 +95,6 @@ #define IXANY 0x00000800 /* any char will restart after stop */ #define IMAXBEL 0x00002000 /* ring bell on input queue full */ #endif /*_POSIX_SOURCE */ -#ifdef __rtems__ -#define IUCLC 0x00004000 /* map upper case to lower case on input */ -#endif /* __rtems__ */ /* * Output flags - software output processing */ @@ -118,31 +115,10 @@ #define TAB1 0x00000004 #define TAB2 0x00000008 #define TAB3 0x0000000C /* expand tabs to spaces */ -#define XTABS 0x0000000C #define ONOEOT 0x00000010 /* discard EOT's (^D) on output) */ #define OCRNL 0x00000020 /* map CR to NL on output */ #define ONOCR 0x00000040 /* no CR output at column 0 */ #define ONLRET 0x00000080 /* NL performs CR function */ -#define OLCUC 0x00000100 /* map lower case to upper case on output */ -#define OFILL 0x00000200 /* send fill characters for a delay, rather than using a timed delay */ -#define OFDEL 0x00000400 /* fill character is ASCII DEL (0177). if unset, fill character is ASCII NUL ('\0') */ -#define NLDLY 0x00000800 /* newline delay mask */ -#define NL0 0x00000000 -#define NL1 0x00000800 -#define CRDLY 0x00003000 /* carriage return delay mask */ -#define CR0 0x00000000 -#define CR1 0x00001000 -#define CR2 0x00002000 -#define CR3 0x00003000 -#define BSDLY 0x00004000 /* Backspace delay mask */ -#define BS0 0x00000000 -#define BS1 0x00004000 -#define VTDLY 0x00008000 /* Vertical tab delay mask */ -#define VT0 0x00000000 -#define VT1 0x00008000 -#define FFDLY 0x00010000 /* Form feed delay mask */ -#define FF0 0x00000000 -#define FF1 0x00010000 #endif /* __rtems__ */ #endif /*_POSIX_SOURCE */ @@ -243,10 +219,6 @@ #define EXTB 38400 #endif /* !_POSIX_SOURCE */ -#ifdef __rtems__ -#define RTEMS_TERMIOS_NUMBER_BAUD_RATES 25 -#endif /* __rtems__ */ - typedef unsigned int tcflag_t; typedef unsigned char cc_t; typedef unsigned int speed_t; diff --git a/cpukit/libcsupport/include/sys/ttycom.h b/cpukit/libcsupport/include/sys/ttycom.h index 823ce3de5f..96da9ef329 100644 --- a/cpukit/libcsupport/include/sys/ttycom.h +++ b/cpukit/libcsupport/include/sys/ttycom.h @@ -60,10 +60,6 @@ struct winsize { /* 3-7 unused */ /* 8-10 compat */ /* 11-12 unused */ -#ifdef __rtems__ -#define RTEMS_IO_SNDWAKEUP _IOW('t', 11, struct ttywakeup ) /* send tty wakeup */ -#define RTEMS_IO_RCVWAKEUP _IOW('t', 12, struct ttywakeup ) /* recv tty wakeup */ -#endif /* __rtems__ */ #define TIOCEXCL _IO('t', 13) /* set exclusive use of tty */ #define TIOCNXCL _IO('t', 14) /* reset exclusive use of tty */ #define TIOCGPTN _IOR('t', 15, int) /* Get pts number. */ diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c index 2fb9d4f483..f310cb05ba 100644 --- a/cpukit/libcsupport/src/termios.c +++ b/cpukit/libcsupport/src/termios.c @@ -577,7 +577,7 @@ rtems_termios_open_tty( * Set default parameters */ tty->termios.c_iflag = BRKINT | ICRNL | IXON | IMAXBEL; - tty->termios.c_oflag = OPOST | ONLCR | XTABS; + tty->termios.c_oflag = OPOST | ONLCR | OXTABS; tty->termios.c_cflag = CS8 | CREAD | CLOCAL; tty->termios.c_lflag = ISIG | ICANON | IEXTEN | ECHO | ECHOK | ECHOE | ECHOCTL; @@ -1188,7 +1188,7 @@ oproc (unsigned char c, rtems_termios_tty *tty, bool wait) case '\t': columnAdj = 8 - (oldColumn & 7); - if ((tty->termios.c_oflag & TABDLY) == XTABS) { + if ((tty->termios.c_oflag & TABDLY) == OXTABS) { int i; len = (size_t) columnAdj; -- cgit v1.2.3