From 53b6484d3827fc93aae2d4c168cdbc07f8496eb9 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 5 Feb 2018 09:57:45 +0100 Subject: termios: Remove obsolete configuration options Update #2843. --- cpukit/include/rtems/confdefs.h | 8 ++++++-- testsuites/libtests/mouse01/init.c | 3 --- testsuites/libtests/termios01/init.c | 3 --- testsuites/libtests/termios03/init.c | 3 --- testsuites/libtests/termios04/init.c | 3 --- testsuites/libtests/termios05/init.c | 3 --- testsuites/libtests/termios06/init.c | 3 --- testsuites/libtests/termios07/init.c | 3 --- testsuites/libtests/termios08/init.c | 3 --- testsuites/libtests/uid01/init.c | 3 --- testsuites/samples/minimum/init.c | 6 ------ 11 files changed, 6 insertions(+), 35 deletions(-) diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h index 75ea1427f7..f1c817d403 100755 --- a/cpukit/include/rtems/confdefs.h +++ b/cpukit/include/rtems/confdefs.h @@ -3421,8 +3421,8 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; #error "Maximum priority configured higher than supported by target." #endif -#ifdef CONFIGURE_TERMIOS_DISABLED - #warning "The CONFIGURE_TERMIOS_DISABLED configuration option is obsolete since RTEMS 5.1" +#ifdef CONFIGURE_NUMBER_OF_TERMIOS_PORTS + #warning "The CONFIGURE_NUMBER_OF_TERMIOS_PORTS configuration option is obsolete since RTEMS 5.1" #endif #ifdef CONFIGURE_MAXIMUM_POSIX_BARRIERS @@ -3449,6 +3449,10 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; #warning "The CONFIGURE_MAXIMUM_POSIX_SPINLOCKS configuration option is obsolete since RTEMS 5.1" #endif +#ifdef CONFIGURE_TERMIOS_DISABLED + #warning "The CONFIGURE_TERMIOS_DISABLED configuration option is obsolete since RTEMS 5.1" +#endif + /* * POSIX Key pair shouldn't be less than POSIX Key, which is highly * likely to be error. diff --git a/testsuites/libtests/mouse01/init.c b/testsuites/libtests/mouse01/init.c index f6efa4ed5b..8b71615d6b 100644 --- a/testsuites/libtests/mouse01/init.c +++ b/testsuites/libtests/mouse01/init.c @@ -160,9 +160,6 @@ rtems_task Init( TERMIOS_TEST_DRIVER_TABLE_ENTRY, \ SERIAL_MOUSE_DRIVER_TABLE_ENTRY -/* one for the console and one for the test port */ -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 - /* we need to be able to open the test device and mouse */ #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5 #define CONFIGURE_MAXIMUM_TASKS 1 diff --git a/testsuites/libtests/termios01/init.c b/testsuites/libtests/termios01/init.c index 1fd2c5789c..461fa99b63 100644 --- a/testsuites/libtests/termios01/init.c +++ b/testsuites/libtests/termios01/init.c @@ -1013,9 +1013,6 @@ static rtems_task Init( /* include an extra slot for registering the termios one dynamically */ #define CONFIGURE_MAXIMUM_DRIVERS 4 -/* one for the console and one for the test port */ -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 3 - /* we need to be able to open the test device */ #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4 diff --git a/testsuites/libtests/termios03/init.c b/testsuites/libtests/termios03/init.c index 70ed74d84d..b9b243920f 100644 --- a/testsuites/libtests/termios03/init.c +++ b/testsuites/libtests/termios03/init.c @@ -165,9 +165,6 @@ rtems_task Init( /* include an extra slot for registering the termios one dynamically */ #define CONFIGURE_MAXIMUM_DRIVERS 3 -/* one for the console and one for the test port */ -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 3 - /* we need to be able to open the test device */ #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4 #define CONFIGURE_MAXIMUM_TASKS 1 diff --git a/testsuites/libtests/termios04/init.c b/testsuites/libtests/termios04/init.c index ad5bb1379d..676640995e 100644 --- a/testsuites/libtests/termios04/init.c +++ b/testsuites/libtests/termios04/init.c @@ -144,9 +144,6 @@ rtems_task Init( /* include an extra slot for registering the termios one dynamically */ #define CONFIGURE_MAXIMUM_DRIVERS 3 -/* one for the console and one for the test port */ -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 3 - /* we need to be able to open the test device */ #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4 #define CONFIGURE_MAXIMUM_TASKS 1 diff --git a/testsuites/libtests/termios05/init.c b/testsuites/libtests/termios05/init.c index c02b7a6194..61251a58d0 100644 --- a/testsuites/libtests/termios05/init.c +++ b/testsuites/libtests/termios05/init.c @@ -155,9 +155,6 @@ rtems_task Init( /* include an extra slot for registering the termios one dynamically */ #define CONFIGURE_MAXIMUM_DRIVERS 3 -/* one for the console and one for the test port */ -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 3 - /* we need to be able to open the test device */ #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4 diff --git a/testsuites/libtests/termios06/init.c b/testsuites/libtests/termios06/init.c index 721643de99..6ed8ac73ff 100644 --- a/testsuites/libtests/termios06/init.c +++ b/testsuites/libtests/termios06/init.c @@ -211,9 +211,6 @@ rtems_task Init( #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_APPLICATION_EXTRA_DRIVERS TERMIOS_TEST_DRIVER_TABLE_ENTRY -/* one for the console and one for the test port */ -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 3 - /* we need to be able to open the test device */ #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4 diff --git a/testsuites/libtests/termios07/init.c b/testsuites/libtests/termios07/init.c index 2da5290ae5..95c684cfbe 100644 --- a/testsuites/libtests/termios07/init.c +++ b/testsuites/libtests/termios07/init.c @@ -171,9 +171,6 @@ rtems_task Init( /* include an extra slot for registering the termios one dynamically */ #define CONFIGURE_MAXIMUM_DRIVERS 3 -/* one for the console and one for the test port */ -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 3 - /* we need to be able to open the test device */ #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4 #define CONFIGURE_MAXIMUM_TASKS 1 diff --git a/testsuites/libtests/termios08/init.c b/testsuites/libtests/termios08/init.c index ee5a5c1269..34f9d23757 100644 --- a/testsuites/libtests/termios08/init.c +++ b/testsuites/libtests/termios08/init.c @@ -154,9 +154,6 @@ rtems_task Init( #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_APPLICATION_EXTRA_DRIVERS TERMIOS_TEST_DRIVER_TABLE_ENTRY -/* one for the console and one for the test port */ -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 3 - /* we need to be able to open the test device */ #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4 diff --git a/testsuites/libtests/uid01/init.c b/testsuites/libtests/uid01/init.c index 99d11f0ed4..85b8f447cd 100644 --- a/testsuites/libtests/uid01/init.c +++ b/testsuites/libtests/uid01/init.c @@ -132,9 +132,6 @@ rtems_task Init( TERMIOS_TEST_DRIVER_TABLE_ENTRY, \ SERIAL_MOUSE_DRIVER_TABLE_ENTRY -/* one for the console and one for the test port */ -#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 - /* we need to be able to open the test device and mouse */ #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5 #define CONFIGURE_MAXIMUM_TASKS 1 diff --git a/testsuites/samples/minimum/init.c b/testsuites/samples/minimum/init.c index 65efad2b5d..c1f423daf3 100644 --- a/testsuites/samples/minimum/init.c +++ b/testsuites/samples/minimum/init.c @@ -52,12 +52,6 @@ static void *Init( uintptr_t ignored ) */ #define CONFIGURE_DISABLE_NEWLIB_REENTRANCY -/* - * This test does not need the console driver so there is no reason - * to configure termios. - */ -#define CONFIGURE_TERMIOS_DISABLED - /* * This test does not use any stdio. */ -- cgit v1.2.3