diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-06-06 08:03:45 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-06-07 12:57:39 +0200 |
commit | 93531e9b08b2c641abc4bf5e53c5ebcd754c7d55 (patch) | |
tree | 8f3826ecf432eeeeb97830b674e037102a9c5b66 /testsuites/libtests/termios | |
parent | Do not use deprecated <sys/termios.h> (diff) | |
download | rtems-93531e9b08b2c641abc4bf5e53c5ebcd754c7d55.tar.bz2 |
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.
Diffstat (limited to '')
-rw-r--r-- | testsuites/libtests/termios/init.c | 82 | ||||
-rw-r--r-- | testsuites/libtests/termios03/init.c | 1 | ||||
-rw-r--r-- | testsuites/libtests/termios05/init.c | 1 | ||||
-rw-r--r-- | testsuites/libtests/termios09/init.c | 6 |
4 files changed, 6 insertions, 84 deletions
diff --git a/testsuites/libtests/termios/init.c b/testsuites/libtests/termios/init.c index d8ac60a8f0..558f095449 100644 --- a/testsuites/libtests/termios/init.c +++ b/testsuites/libtests/termios/init.c @@ -27,6 +27,7 @@ #include <bsp.h> #include <rtems/shell.h> +#include <rtems/termiostypes.h> #include <stdio.h> #include <unistd.h> @@ -131,87 +132,6 @@ void print_c_oflag( struct termios * tp ) if( tp->c_oflag & ONLRET ) printf( "ONLRET " ); - if( tp->c_oflag & OFILL ) - printf( "OFILL " ); - - if( tp->c_oflag & OFDEL ) - printf( "OFDEL " ); - - switch( tp->c_oflag & NLDLY ) { - case NL0: - printf( "NL0 " ); - break; - - case NL1: - printf( "NL1 " ); - break; - } - - switch( tp->c_oflag & CRDLY ) { - case CR0: - printf( "CR0 " ); - break; - - case CR1: - printf( "CR1 " ); - break; - - case CR2: - printf( "CR2 " ); - break; - - case CR3: - printf( "CR3 " ); - break; - } - - switch( tp->c_oflag & TABDLY ) { - case TAB0: - printf( "TAB0 " ); - break; - - case TAB1: - printf( "TAB1 " ); - break; - - case TAB2: - printf( "TAB2 " ); - break; - - case TAB3: - printf( "TAB3 " ); - break; - } - - switch( tp->c_oflag & BSDLY ) { - case BS0: - printf( "BS0 " ); - break; - - case BS1: - printf( "BS1 " ); - break; - } - - switch( tp->c_oflag & VTDLY ) { - case VT0: - printf( "VT0 " ); - break; - - case VT1: - printf( "VT1 " ); - break; - } - - switch( tp->c_oflag & FFDLY ) { - case FF0: - printf( "FF0" ); - break; - - case FF1: - printf( "FF1" ); - break; - } printf( "\n" ); } diff --git a/testsuites/libtests/termios03/init.c b/testsuites/libtests/termios03/init.c index df3af9e81a..ab33ac82fd 100644 --- a/testsuites/libtests/termios03/init.c +++ b/testsuites/libtests/termios03/init.c @@ -21,6 +21,7 @@ #include <unistd.h> #include <termios.h> #include <rtems/dumpbuf.h> +#include <rtems/termiostypes.h> const char rtems_test_name[] = "TERMIOS 3"; diff --git a/testsuites/libtests/termios05/init.c b/testsuites/libtests/termios05/init.c index e9f15314b4..72c9e81a37 100644 --- a/testsuites/libtests/termios05/init.c +++ b/testsuites/libtests/termios05/init.c @@ -21,6 +21,7 @@ #include <unistd.h> #include <termios.h> #include <rtems/dumpbuf.h> +#include <rtems/termiostypes.h> const char rtems_test_name[] = "TERMIOS 5"; diff --git a/testsuites/libtests/termios09/init.c b/testsuites/libtests/termios09/init.c index 9b8992a861..6feb521244 100644 --- a/testsuites/libtests/termios09/init.c +++ b/testsuites/libtests/termios09/init.c @@ -848,7 +848,7 @@ static void test_opost(test_context *ctx) static void test_xtabs(test_context *ctx) { - tcflag_t oflags = OPOST | XTABS; + tcflag_t oflags = OPOST | OXTABS; size_t i; for (i = 0; i < DEVICE_COUNT; ++i) { @@ -952,7 +952,7 @@ static void flush_task(rtems_task_argument arg) static void test_write(test_context *ctx) { - tcflag_t oflags = OPOST | ONLCR | XTABS; + tcflag_t oflags = OPOST | ONLCR | OXTABS; rtems_status_code sc; size_t i = INTERRUPT; device_context *dev = &ctx->devices[i]; @@ -1031,7 +1031,7 @@ static void test_write(test_context *ctx) buf[OUTPUT_BUFFER_SIZE - 1] = '\n'; rtems_test_assert(memcmp(dev->output_buf, buf, OUTPUT_BUFFER_SIZE) == 0); - /* Ensure that XTABS output expansion is taken into account */ + /* Ensure that OXTABS output expansion is taken into account */ dev->tty->column = 0; clear_output(ctx, i); |