[PATCH] config: CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS
Joel Sherrill
joel at rtems.org
Tue Dec 17 16:27:08 UTC 2019
Looks OK to me. Primarily mechanical and adding a warning to confdefs.h.
--joel
On Tue, Dec 17, 2019 at 2:21 AM Sebastian Huber <
sebastian.huber at embedded-brains.de> wrote:
> Rename CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS into
> CONFIGURE_MAXIMUM_FILE_DESCRIPTORS.
>
> Update #3753.
> ---
> cpukit/include/rtems/confdefs.h | 11 ++++++++---
> cpukit/libmisc/dummy/default-configuration.c | 2 +-
> testsuites/fstests/fsbdpart01/init.c | 2 +-
> testsuites/fstests/fsclose01/init.c | 2 +-
> testsuites/fstests/fsdosfsformat01/init.c | 2 +-
> testsuites/fstests/fsdosfsname01/init.c | 2 +-
> testsuites/fstests/fsdosfsname02/init.c | 2 +-
> testsuites/fstests/fsdosfssync01/init.c | 2 +-
> testsuites/fstests/fsdosfswrite01/init.c | 2 +-
> testsuites/fstests/fsfseeko01/init.c | 2 +-
> testsuites/fstests/fsimfsconfig01/init.c | 2 +-
> testsuites/fstests/fsimfsconfig03/init.c | 2 +-
> testsuites/fstests/fsimfsgeneric01/init.c | 2 +-
> testsuites/fstests/fsrofs01/init.c | 2 +-
> testsuites/fstests/imfs_support/fs_support.c | 2 +-
> testsuites/fstests/jffs2_support/fs_support.c | 2 +-
> testsuites/fstests/mdosfs_support/fs_support.c | 2 +-
> testsuites/fstests/mimfs_support/fs_support.c | 2 +-
> testsuites/fstests/mrfs_support/fs_support.c | 2 +-
> testsuites/libtests/block01/init.c | 2 +-
> testsuites/libtests/block02/init.c | 2 +-
> testsuites/libtests/block03/init.c | 2 +-
> testsuites/libtests/block04/init.c | 2 +-
> testsuites/libtests/block05/init.c | 2 +-
> testsuites/libtests/block06/init.c | 2 +-
> testsuites/libtests/block07/init.c | 2 +-
> testsuites/libtests/block08/system.h | 2 +-
> testsuites/libtests/block09/init.c | 2 +-
> testsuites/libtests/block10/init.c | 2 +-
> testsuites/libtests/block11/init.c | 2 +-
> testsuites/libtests/block12/init.c | 2 +-
> testsuites/libtests/block13/init.c | 2 +-
> testsuites/libtests/block14/init.c | 2 +-
> testsuites/libtests/block15/init.c | 2 +-
> testsuites/libtests/block16/init.c | 2 +-
> testsuites/libtests/devfs02/init.c | 2 +-
> testsuites/libtests/devfs03/init.c | 2 +-
> testsuites/libtests/devfs04/init.c | 2 +-
> testsuites/libtests/deviceio01/init.c | 2 +-
> testsuites/libtests/dl01/init.c | 2 +-
> testsuites/libtests/dl02/init.c | 2 +-
> testsuites/libtests/dl03/init.c | 2 +-
> testsuites/libtests/dl04/init.c | 2 +-
> testsuites/libtests/dl05/init.c | 2 +-
> testsuites/libtests/dl06/initimpl.h | 2 +-
> testsuites/libtests/dl07/init.c | 2 +-
> testsuites/libtests/dl08/init.c | 2 +-
> testsuites/libtests/dl09/init.c | 2 +-
> testsuites/libtests/dl10/init.c | 2 +-
> testsuites/libtests/flashdisk01/init.c | 2 +-
> testsuites/libtests/ftp01/init.c | 2 +-
> testsuites/libtests/i2c01/init.c | 2 +-
> testsuites/libtests/mghttpd01/init.c | 2 +-
> testsuites/libtests/mouse01/init.c | 2 +-
> testsuites/libtests/newlib01/init.c | 2 +-
> testsuites/libtests/pwdgrp01/init.c | 2 +-
> testsuites/libtests/pwdgrp02/init.c | 2 +-
> testsuites/libtests/record01/init.c | 2 +-
> testsuites/libtests/shell01/init.c | 2 +-
> testsuites/libtests/sparsedisk01/init.c | 2 +-
> testsuites/libtests/spi01/init.c | 2 +-
> testsuites/libtests/syscall01/init.c | 2 +-
> testsuites/libtests/tar01/init.c | 2 +-
> testsuites/libtests/tar02/init.c | 2 +-
> testsuites/libtests/telnetd01/init.c | 2 +-
> testsuites/libtests/termios01/init.c | 2 +-
> testsuites/libtests/termios03/init.c | 2 +-
> testsuites/libtests/termios04/init.c | 2 +-
> testsuites/libtests/termios05/init.c | 2 +-
> testsuites/libtests/termios06/init.c | 2 +-
> testsuites/libtests/termios07/init.c | 2 +-
> testsuites/libtests/termios08/init.c | 2 +-
> testsuites/libtests/termios09/init.c | 2 +-
> testsuites/libtests/termios10/termios10impl.h | 2 +-
> testsuites/libtests/ttest01/init.c | 2 +-
> testsuites/libtests/uid01/init.c | 2 +-
> testsuites/psxtests/psx13/main.c | 2 +-
> testsuites/psxtests/psxaio01/system.h | 2 +-
> testsuites/psxtests/psxaio02/system.h | 2 +-
> testsuites/psxtests/psxaio03/system.h | 2 +-
> testsuites/psxtests/psxchroot01/main.c | 2 +-
> testsuites/psxtests/psxconfig01/init.c | 8 ++++----
> testsuites/psxtests/psxfchx01/init.c | 2 +-
> testsuites/psxtests/psxfenv01/init.c | 2 +-
> testsuites/psxtests/psxfile01/main.c | 2 +-
> testsuites/psxtests/psxfile02/init.c | 2 +-
> testsuites/psxtests/psxfilelock01/init.c | 2 +-
> testsuites/psxtests/psxid01/init.c | 2 +-
> testsuites/psxtests/psximfs01/init.c | 2 +-
> testsuites/psxtests/psximfs02/init.c | 2 +-
> testsuites/psxtests/psxmmap01/system.h | 2 +-
> testsuites/psxtests/psxmount/main.c | 2 +-
> testsuites/psxtests/psxndbm01/init.c | 2 +-
> testsuites/psxtests/psxpasswd01/init.c | 2 +-
> testsuites/psxtests/psxpasswd02/init.c | 2 +-
> testsuites/psxtests/psxpipe01/init.c | 2 +-
> testsuites/psxtests/psxrdwrv/main.c | 2 +-
> testsuites/psxtests/psxreaddir/main.c | 2 +-
> testsuites/psxtests/psxshm01/system.h | 2 +-
> testsuites/psxtests/psxshm02/system.h | 2 +-
> testsuites/psxtests/psxstat/main.c | 2 +-
> testsuites/samples/fileio/system.h | 2 +-
> testsuites/samples/loopback/init.c | 2 +-
> testsuites/samples/minimum/init.c | 2 +-
> testsuites/samples/pppd/system.h | 2 +-
> testsuites/sptests/spconsole01/init.c | 2 +-
> testsuites/sptests/spfatal14/init.c | 2 +-
> testsuites/sptests/spfatal15/init.c | 2 +-
> testsuites/sptests/spfifo01/init.c | 2 +-
> testsuites/sptests/spfifo02/init.c | 2 +-
> testsuites/sptests/spfifo03/init.c | 2 +-
> testsuites/sptests/spfifo04/init.c | 2 +-
> testsuites/sptests/spfifo05/init.c | 2 +-
> testsuites/sptests/spintrcritical24/init.c | 2 +-
> testsuites/sptests/spmkdir/init.c | 2 +-
> testsuites/sptests/spsysinit01/init.c | 2 +-
> 116 files changed, 126 insertions(+), 121 deletions(-)
>
> diff --git a/cpukit/include/rtems/confdefs.h
> b/cpukit/include/rtems/confdefs.h
> index 796f618bc6..8565dfde7d 100644
> --- a/cpukit/include/rtems/confdefs.h
> +++ b/cpukit/include/rtems/confdefs.h
> @@ -144,13 +144,18 @@ extern rtems_initialization_tasks_table
> Initialization_tasks[];
> #endif
> #endif
>
> +#ifdef CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS
> + #warning "CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS has been renamed to
> CONFIGURE_MAXIMUM_FILE_DESCRIPTORS since RTEMS 5.1"
> + #define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS
> CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS
> +#endif
> +
> /**
> * This macro defines the number of POSIX file descriptors allocated
> * and managed by libio. These are the "integer" file descriptors that
> * are used by calls like open(2) and read(2).
> */
> -#ifndef CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS
> - #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 3
> +#ifndef CONFIGURE_MAXIMUM_FILE_DESCRIPTORS
> + #define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 3
> #endif
>
> /*
> @@ -159,7 +164,7 @@ extern rtems_initialization_tasks_table
> Initialization_tasks[];
> #define _CONFIGURE_LIBIO_POSIX_KEYS 1
>
> #ifdef CONFIGURE_INIT
> - rtems_libio_t
> rtems_libio_iops[CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS];
> + rtems_libio_t rtems_libio_iops[CONFIGURE_MAXIMUM_FILE_DESCRIPTORS];
>
> /**
> * When instantiating the configuration tables, this variable is
> diff --git a/cpukit/libmisc/dummy/default-configuration.c
> b/cpukit/libmisc/dummy/default-configuration.c
> index 5e130bce52..9c30b270c2 100644
> --- a/cpukit/libmisc/dummy/default-configuration.c
> +++ b/cpukit/libmisc/dummy/default-configuration.c
> @@ -93,7 +93,7 @@ static void Init( rtems_task_argument arg )
> #define CONFIGURE_UNLIMITED_OBJECTS
> #define CONFIGURE_MAXIMUM_USER_EXTENSIONS 8
> #define CONFIGURE_MAXIMUM_DRIVERS 16
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 32
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 32
>
> /* Include basic device drivers needed to call delays */
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> diff --git a/testsuites/fstests/fsbdpart01/init.c
> b/testsuites/fstests/fsbdpart01/init.c
> index 0ac42c5a1d..8f4e35935a 100644
> --- a/testsuites/fstests/fsbdpart01/init.c
> +++ b/testsuites/fstests/fsbdpart01/init.c
> @@ -228,7 +228,7 @@ size_t rtems_ramdisk_configuration_size = 1;
> #define CONFIGURE_APPLICATION_EXTRA_DRIVERS RAMDISK_DRIVER_TABLE_ENTRY
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 13
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 13
>
> #define CONFIGURE_MAXIMUM_TASKS 2
>
> diff --git a/testsuites/fstests/fsclose01/init.c
> b/testsuites/fstests/fsclose01/init.c
> index b9b8d0c357..445711d677 100644
> --- a/testsuites/fstests/fsclose01/init.c
> +++ b/testsuites/fstests/fsclose01/init.c
> @@ -541,7 +541,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 5
>
> #define CONFIGURE_MAXIMUM_TASKS 2
>
> diff --git a/testsuites/fstests/fsdosfsformat01/init.c
> b/testsuites/fstests/fsdosfsformat01/init.c
> index a8477cb61f..c636e848e6 100644
> --- a/testsuites/fstests/fsdosfsformat01/init.c
> +++ b/testsuites/fstests/fsdosfsformat01/init.c
> @@ -511,7 +511,7 @@ static void Init( rtems_task_argument arg )
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> /* one active file + stdin + stdout + stderr + device file when mounted */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 5
>
> #define CONFIGURE_FILESYSTEM_DOSFS
>
> diff --git a/testsuites/fstests/fsdosfsname01/init.c
> b/testsuites/fstests/fsdosfsname01/init.c
> index 1785b6514e..c76c8b48e1 100644
> --- a/testsuites/fstests/fsdosfsname01/init.c
> +++ b/testsuites/fstests/fsdosfsname01/init.c
> @@ -1446,7 +1446,7 @@ size_t rtems_ramdisk_configuration_size =
> RTEMS_ARRAY_SIZE(rtems_ramdisk_configu
>
> /* 2 RAM disk device files + 2 mount_dir + stdin + stdout + stderr +
> * 2 for open directories/files + 4 * 2 for recursive tree compares*/
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS ( 7 + 2 + ( 4 * 2 ) )
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS ( 7 + 2 + ( 4 * 2 ) )
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/fstests/fsdosfsname02/init.c
> b/testsuites/fstests/fsdosfsname02/init.c
> index 929157b18b..b83f837b0f 100644
> --- a/testsuites/fstests/fsdosfsname02/init.c
> +++ b/testsuites/fstests/fsdosfsname02/init.c
> @@ -100,7 +100,7 @@ size_t rtems_ramdisk_configuration_size =
> RTEMS_ARRAY_SIZE(rtems_ramdisk_configu
>
> #define CONFIGURE_FILESYSTEM_DOSFS
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 32
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 32
>
> #define CONFIGURE_BDBUF_CACHE_MEMORY_SIZE 512
> #define CONFIGURE_BDBUF_BUFFER_MIN_SIZE 512
> diff --git a/testsuites/fstests/fsdosfssync01/init.c
> b/testsuites/fstests/fsdosfssync01/init.c
> index a29e905b26..37b7a55043 100644
> --- a/testsuites/fstests/fsdosfssync01/init.c
> +++ b/testsuites/fstests/fsdosfssync01/init.c
> @@ -156,7 +156,7 @@ size_t rtems_ramdisk_configuration_size = 1;
> #define CONFIGURE_APPLICATION_EXTRA_DRIVERS RAMDISK_DRIVER_TABLE_ENTRY
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 6
>
> #define CONFIGURE_FILESYSTEM_DOSFS
>
> diff --git a/testsuites/fstests/fsdosfswrite01/init.c
> b/testsuites/fstests/fsdosfswrite01/init.c
> index 5048bdb224..4b60e5b9a7 100644
> --- a/testsuites/fstests/fsdosfswrite01/init.c
> +++ b/testsuites/fstests/fsdosfswrite01/init.c
> @@ -289,7 +289,7 @@ static void Init( rtems_task_argument arg )
> #define CONFIGURE_FILESYSTEM_DOSFS
>
> /* 1 device file for blkstats + 1 file for writing + 1 mount_dir + stdin
> + stdout + stderr + device file when mounted */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 8
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 8
>
> #define CONFIGURE_UNLIMITED_OBJECTS
> #define CONFIGURE_UNIFIED_WORK_AREAS
> diff --git a/testsuites/fstests/fsfseeko01/init.c
> b/testsuites/fstests/fsfseeko01/init.c
> index 26aa9a7ea8..448ff76894 100644
> --- a/testsuites/fstests/fsfseeko01/init.c
> +++ b/testsuites/fstests/fsfseeko01/init.c
> @@ -98,7 +98,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/fstests/fsimfsconfig01/init.c
> b/testsuites/fstests/fsimfsconfig01/init.c
> index 5ba3f1f24c..0dda09aeaa 100644
> --- a/testsuites/fstests/fsimfsconfig01/init.c
> +++ b/testsuites/fstests/fsimfsconfig01/init.c
> @@ -144,7 +144,7 @@ static void Init(rtems_task_argument arg)
>
> #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_FILESYSTEM_IMFS
>
> diff --git a/testsuites/fstests/fsimfsconfig03/init.c
> b/testsuites/fstests/fsimfsconfig03/init.c
> index 4905697b19..a9eb6968d7 100644
> --- a/testsuites/fstests/fsimfsconfig03/init.c
> +++ b/testsuites/fstests/fsimfsconfig03/init.c
> @@ -127,7 +127,7 @@ static void Init(rtems_task_argument arg)
>
> #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 1
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 1
>
> #define CONFIGURE_FILESYSTEM_IMFS
>
> diff --git a/testsuites/fstests/fsimfsgeneric01/init.c
> b/testsuites/fstests/fsimfsgeneric01/init.c
> index 300bc01178..dc216181a4 100644
> --- a/testsuites/fstests/fsimfsgeneric01/init.c
> +++ b/testsuites/fstests/fsimfsgeneric01/init.c
> @@ -492,7 +492,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/fstests/fsrofs01/init.c
> b/testsuites/fstests/fsrofs01/init.c
> index 6173701a24..2d5b93ac3b 100644
> --- a/testsuites/fstests/fsrofs01/init.c
> +++ b/testsuites/fstests/fsrofs01/init.c
> @@ -173,7 +173,7 @@ size_t rtems_ramdisk_configuration_size = 1;
> #define CONFIGURE_APPLICATION_EXTRA_DRIVERS RAMDISK_DRIVER_TABLE_ENTRY
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 5
>
> #define CONFIGURE_FILESYSTEM_RFS
>
> diff --git a/testsuites/fstests/imfs_support/fs_support.c
> b/testsuites/fstests/imfs_support/fs_support.c
> index 04b8982603..5e3f7db84b 100644
> --- a/testsuites/fstests/imfs_support/fs_support.c
> +++ b/testsuites/fstests/imfs_support/fs_support.c
> @@ -38,7 +38,7 @@ test_shutdown_filesystem (void)
> #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
>
> #define CONFIGURE_MAXIMUM_TASKS 10
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 40
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 40
> #define CONFIGURE_INIT_TASK_STACK_SIZE (16 * 1024)
> #define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_FLOATING_POINT
> #define CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS 1
> diff --git a/testsuites/fstests/jffs2_support/fs_support.c
> b/testsuites/fstests/jffs2_support/fs_support.c
> index a855c8edee..b714183be7 100644
> --- a/testsuites/fstests/jffs2_support/fs_support.c
> +++ b/testsuites/fstests/jffs2_support/fs_support.c
> @@ -148,7 +148,7 @@ void test_shutdown_filesystem(void)
>
> #define CONFIGURE_FILESYSTEM_JFFS2
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 40
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 40
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/fstests/mdosfs_support/fs_support.c
> b/testsuites/fstests/mdosfs_support/fs_support.c
> index b43fca92a4..4d740bb0ad 100644
> --- a/testsuites/fstests/mdosfs_support/fs_support.c
> +++ b/testsuites/fstests/mdosfs_support/fs_support.c
> @@ -87,7 +87,7 @@ void test_shutdown_filesystem(void)
>
> #define CONFIGURE_MAXIMUM_SEMAPHORES RTEMS_DOSFS_SEMAPHORES_PER_INSTANCE
> #define CONFIGURE_MAXIMUM_TASKS 10
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 40
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 40
> #define CONFIGURE_INIT_TASK_STACK_SIZE (16 * 1024)
> #define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_FLOATING_POINT
> #define CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS 1
> diff --git a/testsuites/fstests/mimfs_support/fs_support.c
> b/testsuites/fstests/mimfs_support/fs_support.c
> index 7e54199f11..66192faff0 100644
> --- a/testsuites/fstests/mimfs_support/fs_support.c
> +++ b/testsuites/fstests/mimfs_support/fs_support.c
> @@ -61,7 +61,7 @@ test_shutdown_filesystem (void)
> #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
>
> #define CONFIGURE_MAXIMUM_TASKS 10
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 40
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 40
> #define CONFIGURE_INIT_TASK_STACK_SIZE (32 * 1024)
> #define CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS 1
>
> diff --git a/testsuites/fstests/mrfs_support/fs_support.c
> b/testsuites/fstests/mrfs_support/fs_support.c
> index 0382bbb122..f2fea75f8e 100644
> --- a/testsuites/fstests/mrfs_support/fs_support.c
> +++ b/testsuites/fstests/mrfs_support/fs_support.c
> @@ -66,7 +66,7 @@ test_shutdown_filesystem (void)
> #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
>
> #define CONFIGURE_MAXIMUM_TASKS 10
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 40
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 40
> #define CONFIGURE_INIT_TASK_STACK_SIZE (32 * 1024)
> #define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_FLOATING_POINT
> #define CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS 1
> diff --git a/testsuites/libtests/block01/init.c
> b/testsuites/libtests/block01/init.c
> index f7761960ed..16e0644534 100644
> --- a/testsuites/libtests/block01/init.c
> +++ b/testsuites/libtests/block01/init.c
> @@ -256,7 +256,7 @@ static rtems_task Init(rtems_task_argument argument)
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_MAXIMUM_DRIVERS 2
> diff --git a/testsuites/libtests/block02/init.c
> b/testsuites/libtests/block02/init.c
> index d65df94f08..73362fcc83 100644
> --- a/testsuites/libtests/block02/init.c
> +++ b/testsuites/libtests/block02/init.c
> @@ -210,7 +210,7 @@ static rtems_task Init(rtems_task_argument argument)
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 3
>
> diff --git a/testsuites/libtests/block03/init.c
> b/testsuites/libtests/block03/init.c
> index 55f2398db8..9ab907c0d4 100644
> --- a/testsuites/libtests/block03/init.c
> +++ b/testsuites/libtests/block03/init.c
> @@ -203,7 +203,7 @@ static rtems_task Init(rtems_task_argument argument)
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 3
>
> diff --git a/testsuites/libtests/block04/init.c
> b/testsuites/libtests/block04/init.c
> index 891552d461..ff122a7c39 100644
> --- a/testsuites/libtests/block04/init.c
> +++ b/testsuites/libtests/block04/init.c
> @@ -175,7 +175,7 @@ static rtems_task Init(rtems_task_argument argument)
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 3
>
> diff --git a/testsuites/libtests/block05/init.c
> b/testsuites/libtests/block05/init.c
> index be456dd6b6..5d54c79c9f 100644
> --- a/testsuites/libtests/block05/init.c
> +++ b/testsuites/libtests/block05/init.c
> @@ -513,7 +513,7 @@ static rtems_task Init(rtems_task_argument argument)
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 5
>
> #define CONFIGURE_MAXIMUM_TASKS 4
>
> diff --git a/testsuites/libtests/block06/init.c
> b/testsuites/libtests/block06/init.c
> index b134e5d3b6..3fa70c05b6 100644
> --- a/testsuites/libtests/block06/init.c
> +++ b/testsuites/libtests/block06/init.c
> @@ -1771,7 +1771,7 @@ static rtems_task Init(rtems_task_argument argument)
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_BDBUF_TASK_STACK_SIZE BDBUF_TEST_STACK_SIZE
>
> diff --git a/testsuites/libtests/block07/init.c
> b/testsuites/libtests/block07/init.c
> index 05bfff99ba..19d53d10fe 100644
> --- a/testsuites/libtests/block07/init.c
> +++ b/testsuites/libtests/block07/init.c
> @@ -276,7 +276,7 @@ static rtems_task Init(rtems_task_argument argument)
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 4
>
> diff --git a/testsuites/libtests/block08/system.h
> b/testsuites/libtests/block08/system.h
> index bb4a9a0bb1..287ad38bc6 100644
> --- a/testsuites/libtests/block08/system.h
> +++ b/testsuites/libtests/block08/system.h
> @@ -24,7 +24,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 28
> #define CONFIGURE_MAXIMUM_TIMERS 10
> diff --git a/testsuites/libtests/block09/init.c
> b/testsuites/libtests/block09/init.c
> index 3e8b8cd83e..73bec67c3f 100644
> --- a/testsuites/libtests/block09/init.c
> +++ b/testsuites/libtests/block09/init.c
> @@ -221,7 +221,7 @@ static rtems_task Init(rtems_task_argument argument)
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/block10/init.c
> b/testsuites/libtests/block10/init.c
> index 89f1ac2666..8e67c055d1 100644
> --- a/testsuites/libtests/block10/init.c
> +++ b/testsuites/libtests/block10/init.c
> @@ -465,7 +465,7 @@ static rtems_task Init(rtems_task_argument argument)
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 3
>
> diff --git a/testsuites/libtests/block11/init.c
> b/testsuites/libtests/block11/init.c
> index b5b3a5d7e2..d5ed580426 100644
> --- a/testsuites/libtests/block11/init.c
> +++ b/testsuites/libtests/block11/init.c
> @@ -420,7 +420,7 @@ static rtems_task Init(rtems_task_argument argument)
> { .initialization_entry = invalid_initialize, \
> .control_entry = invalid_control }
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 5
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/block12/init.c
> b/testsuites/libtests/block12/init.c
> index ddc27958aa..eb548e9ccb 100644
> --- a/testsuites/libtests/block12/init.c
> +++ b/testsuites/libtests/block12/init.c
> @@ -143,7 +143,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_BDBUF_BUFFER_MIN_SIZE 1
> #define CONFIGURE_BDBUF_BUFFER_MAX_SIZE 1
> diff --git a/testsuites/libtests/block13/init.c
> b/testsuites/libtests/block13/init.c
> index 0eb5d676ee..f001ed8fcd 100644
> --- a/testsuites/libtests/block13/init.c
> +++ b/testsuites/libtests/block13/init.c
> @@ -228,7 +228,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_BDBUF_BUFFER_MIN_SIZE 1
> #define CONFIGURE_BDBUF_BUFFER_MAX_SIZE 1
> diff --git a/testsuites/libtests/block14/init.c
> b/testsuites/libtests/block14/init.c
> index 36325f5892..1586ef96c9 100644
> --- a/testsuites/libtests/block14/init.c
> +++ b/testsuites/libtests/block14/init.c
> @@ -208,7 +208,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_BDBUF_BUFFER_MIN_SIZE 1
> #define CONFIGURE_BDBUF_BUFFER_MAX_SIZE 1
> diff --git a/testsuites/libtests/block15/init.c
> b/testsuites/libtests/block15/init.c
> index 925a772842..52be4c5df0 100644
> --- a/testsuites/libtests/block15/init.c
> +++ b/testsuites/libtests/block15/init.c
> @@ -173,7 +173,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_BDBUF_BUFFER_MIN_SIZE 1
> #define CONFIGURE_BDBUF_BUFFER_MAX_SIZE 4
> diff --git a/testsuites/libtests/block16/init.c
> b/testsuites/libtests/block16/init.c
> index 64ccded9dc..215b69f744 100644
> --- a/testsuites/libtests/block16/init.c
> +++ b/testsuites/libtests/block16/init.c
> @@ -139,7 +139,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_BDBUF_BUFFER_MAX_SIZE 8
> #define CONFIGURE_BDBUF_CACHE_MEMORY_SIZE 8
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/devfs02/init.c
> b/testsuites/libtests/devfs02/init.c
> index b9de92a2a5..3e136972b3 100644
> --- a/testsuites/libtests/devfs02/init.c
> +++ b/testsuites/libtests/devfs02/init.c
> @@ -96,7 +96,7 @@ rtems_task Init(
>
> #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 2
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 2
>
> /* Make sure that we have enough devices for all BSPs */
> #define CONFIGURE_MAXIMUM_DEVICES 64
> diff --git a/testsuites/libtests/devfs03/init.c
> b/testsuites/libtests/devfs03/init.c
> index b9917b84fb..24940832f0 100644
> --- a/testsuites/libtests/devfs03/init.c
> +++ b/testsuites/libtests/devfs03/init.c
> @@ -86,7 +86,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> diff --git a/testsuites/libtests/devfs04/init.c
> b/testsuites/libtests/devfs04/init.c
> index 2ddd66a419..bc747a8e07 100644
> --- a/testsuites/libtests/devfs04/init.c
> +++ b/testsuites/libtests/devfs04/init.c
> @@ -81,7 +81,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_EXTRA_DRIVERS TEST_DRIVER_TABLE_ENTRY
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 2
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 2
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
> diff --git a/testsuites/libtests/deviceio01/init.c
> b/testsuites/libtests/deviceio01/init.c
> index c4e7f26a2a..ff6223234f 100644
> --- a/testsuites/libtests/deviceio01/init.c
> +++ b/testsuites/libtests/deviceio01/init.c
> @@ -70,7 +70,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_EXTRA_DRIVERS TEST_DRIVER_TABLE_ENTRY
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 5
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
> diff --git a/testsuites/libtests/dl01/init.c
> b/testsuites/libtests/dl01/init.c
> index 2f9c5209d0..6317dc8504 100644
> --- a/testsuites/libtests/dl01/init.c
> +++ b/testsuites/libtests/dl01/init.c
> @@ -65,7 +65,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/dl02/init.c
> b/testsuites/libtests/dl02/init.c
> index 459d1b182a..7dc5dabbe2 100644
> --- a/testsuites/libtests/dl02/init.c
> +++ b/testsuites/libtests/dl02/init.c
> @@ -65,7 +65,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/dl03/init.c
> b/testsuites/libtests/dl03/init.c
> index 6d83762413..d7242b744a 100644
> --- a/testsuites/libtests/dl03/init.c
> +++ b/testsuites/libtests/dl03/init.c
> @@ -51,7 +51,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/dl04/init.c
> b/testsuites/libtests/dl04/init.c
> index d56b235f90..00fe74026c 100644
> --- a/testsuites/libtests/dl04/init.c
> +++ b/testsuites/libtests/dl04/init.c
> @@ -65,7 +65,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/dl05/init.c
> b/testsuites/libtests/dl05/init.c
> index 37dd99b188..578105c5f2 100644
> --- a/testsuites/libtests/dl05/init.c
> +++ b/testsuites/libtests/dl05/init.c
> @@ -65,7 +65,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/dl06/initimpl.h
> b/testsuites/libtests/dl06/initimpl.h
> index 7dd8621fa2..e3500a11c1 100644
> --- a/testsuites/libtests/dl06/initimpl.h
> +++ b/testsuites/libtests/dl06/initimpl.h
> @@ -69,7 +69,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/dl07/init.c
> b/testsuites/libtests/dl07/init.c
> index 9d8e375b27..732e0f5387 100644
> --- a/testsuites/libtests/dl07/init.c
> +++ b/testsuites/libtests/dl07/init.c
> @@ -71,7 +71,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/dl08/init.c
> b/testsuites/libtests/dl08/init.c
> index 65291bd277..345fe27ee7 100644
> --- a/testsuites/libtests/dl08/init.c
> +++ b/testsuites/libtests/dl08/init.c
> @@ -71,7 +71,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/dl09/init.c
> b/testsuites/libtests/dl09/init.c
> index eafb5f4516..56492607c7 100644
> --- a/testsuites/libtests/dl09/init.c
> +++ b/testsuites/libtests/dl09/init.c
> @@ -71,7 +71,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/dl10/init.c
> b/testsuites/libtests/dl10/init.c
> index d3a0457f88..c891d82e04 100644
> --- a/testsuites/libtests/dl10/init.c
> +++ b/testsuites/libtests/dl10/init.c
> @@ -106,7 +106,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 10
>
> #define CONFIGURE_MAXIMUM_TASKS 4
>
> diff --git a/testsuites/libtests/flashdisk01/init.c
> b/testsuites/libtests/flashdisk01/init.c
> index 47f8c2bbeb..18ab4e97c4 100644
> --- a/testsuites/libtests/flashdisk01/init.c
> +++ b/testsuites/libtests/flashdisk01/init.c
> @@ -332,7 +332,7 @@ uint32_t rtems_flashdisk_configuration_size =
> FLASHDISK_CONFIG_COUNT;
> #define CONFIGURE_APPLICATION_EXTRA_DRIVERS FLASHDISK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 6
>
> #define CONFIGURE_FILESYSTEM_RFS
>
> diff --git a/testsuites/libtests/ftp01/init.c
> b/testsuites/libtests/ftp01/init.c
> index acbbcbe4ad..620a0682cd 100644
> --- a/testsuites/libtests/ftp01/init.c
> +++ b/testsuites/libtests/ftp01/init.c
> @@ -251,7 +251,7 @@ static rtems_task Init(rtems_task_argument argument)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 14
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 14
>
> #define CONFIGURE_FILESYSTEM_FTPFS
>
> diff --git a/testsuites/libtests/i2c01/init.c
> b/testsuites/libtests/i2c01/init.c
> index f993fa0259..02a3558611 100644
> --- a/testsuites/libtests/i2c01/init.c
> +++ b/testsuites/libtests/i2c01/init.c
> @@ -655,7 +655,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 7
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 7
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/mghttpd01/init.c
> b/testsuites/libtests/mghttpd01/init.c
> index 5c00dde844..75c2d8d8d7 100644
> --- a/testsuites/libtests/mghttpd01/init.c
> +++ b/testsuites/libtests/mghttpd01/init.c
> @@ -272,7 +272,7 @@ static void Init(rtems_task_argument arg)
>
> #define CONFIGURE_FILESYSTEM_IMFS
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 16
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 16
>
> #define CONFIGURE_UNLIMITED_OBJECTS
>
> diff --git a/testsuites/libtests/mouse01/init.c
> b/testsuites/libtests/mouse01/init.c
> index b20afe121c..5f9ed18161 100644
> --- a/testsuites/libtests/mouse01/init.c
> +++ b/testsuites/libtests/mouse01/init.c
> @@ -160,7 +160,7 @@ rtems_task Init(
> SERIAL_MOUSE_DRIVER_TABLE_ENTRY
>
> /* we need to be able to open the test device and mouse */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 5
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_MAXIMUM_TIMERS 2
> #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
> diff --git a/testsuites/libtests/newlib01/init.c
> b/testsuites/libtests/newlib01/init.c
> index e9cf4d1f22..74e648799e 100644
> --- a/testsuites/libtests/newlib01/init.c
> +++ b/testsuites/libtests/newlib01/init.c
> @@ -302,7 +302,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 2
>
> diff --git a/testsuites/libtests/pwdgrp01/init.c
> b/testsuites/libtests/pwdgrp01/init.c
> index 7e9f77a379..ebdd6903e3 100644
> --- a/testsuites/libtests/pwdgrp01/init.c
> +++ b/testsuites/libtests/pwdgrp01/init.c
> @@ -160,7 +160,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_MAXIMUM_POSIX_KEYS 1
> diff --git a/testsuites/libtests/pwdgrp02/init.c
> b/testsuites/libtests/pwdgrp02/init.c
> index ec2bdf1c3e..82aa8628a3 100644
> --- a/testsuites/libtests/pwdgrp02/init.c
> +++ b/testsuites/libtests/pwdgrp02/init.c
> @@ -165,7 +165,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/record01/init.c
> b/testsuites/libtests/record01/init.c
> index 8cca7846bd..fea509089a 100644
> --- a/testsuites/libtests/record01/init.c
> +++ b/testsuites/libtests/record01/init.c
> @@ -771,7 +771,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> #ifdef RTEMS_NETWORKING
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 7
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 7
>
> #define CONFIGURE_MAXIMUM_TASKS 3
>
> diff --git a/testsuites/libtests/shell01/init.c
> b/testsuites/libtests/shell01/init.c
> index bc28463009..545d695d86 100644
> --- a/testsuites/libtests/shell01/init.c
> +++ b/testsuites/libtests/shell01/init.c
> @@ -171,7 +171,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_MAXIMUM_POSIX_KEYS 1
> diff --git a/testsuites/libtests/sparsedisk01/init.c
> b/testsuites/libtests/sparsedisk01/init.c
> index e0d25fa444..b93b817121 100644
> --- a/testsuites/libtests/sparsedisk01/init.c
> +++ b/testsuites/libtests/sparsedisk01/init.c
> @@ -426,7 +426,7 @@ static void Init( rtems_task_argument arg )
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_MAXIMUM_SEMAPHORES 1
> diff --git a/testsuites/libtests/spi01/init.c
> b/testsuites/libtests/spi01/init.c
> index 6f086d4ac6..8de4f498ed 100644
> --- a/testsuites/libtests/spi01/init.c
> +++ b/testsuites/libtests/spi01/init.c
> @@ -273,7 +273,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 7
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 7
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/libtests/syscall01/init.c
> b/testsuites/libtests/syscall01/init.c
> index e1c2369ca7..f2ddbbeb97 100644
> --- a/testsuites/libtests/syscall01/init.c
> +++ b/testsuites/libtests/syscall01/init.c
> @@ -321,7 +321,7 @@ static rtems_device_driver open_driver_open(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_EXTRA_DRIVERS OPEN_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 3
>
> diff --git a/testsuites/libtests/tar01/init.c
> b/testsuites/libtests/tar01/init.c
> index 371ea71920..4cad67a6ae 100644
> --- a/testsuites/libtests/tar01/init.c
> +++ b/testsuites/libtests/tar01/init.c
> @@ -307,7 +307,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 5
>
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> diff --git a/testsuites/libtests/tar02/init.c
> b/testsuites/libtests/tar02/init.c
> index 689412bab5..7a1395b873 100644
> --- a/testsuites/libtests/tar02/init.c
> +++ b/testsuites/libtests/tar02/init.c
> @@ -140,7 +140,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 5
>
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> diff --git a/testsuites/libtests/telnetd01/init.c
> b/testsuites/libtests/telnetd01/init.c
> index e7c2540840..a17126bf41 100644
> --- a/testsuites/libtests/telnetd01/init.c
> +++ b/testsuites/libtests/telnetd01/init.c
> @@ -105,7 +105,7 @@ static rtems_task Init(rtems_task_argument argument)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS (3 + 1 + 5 * 4)
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS (3 + 1 + 5 * 4)
>
> #define CONFIGURE_MAXIMUM_TASKS 8
>
> diff --git a/testsuites/libtests/termios01/init.c
> b/testsuites/libtests/termios01/init.c
> index 461fa99b63..09be07bbcc 100644
> --- a/testsuites/libtests/termios01/init.c
> +++ b/testsuites/libtests/termios01/init.c
> @@ -1014,7 +1014,7 @@ static rtems_task Init(
> #define CONFIGURE_MAXIMUM_DRIVERS 4
>
> /* we need to be able to open the test device */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
> diff --git a/testsuites/libtests/termios03/init.c
> b/testsuites/libtests/termios03/init.c
> index d88d059e29..6f602f4df9 100644
> --- a/testsuites/libtests/termios03/init.c
> +++ b/testsuites/libtests/termios03/init.c
> @@ -163,7 +163,7 @@ rtems_task Init(
> TERMIOS_TEST_DRIVER_TABLE_ENTRY
>
> /* we need to be able to open the test device */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> diff --git a/testsuites/libtests/termios04/init.c
> b/testsuites/libtests/termios04/init.c
> index 9540db1967..fe2adeb40d 100644
> --- a/testsuites/libtests/termios04/init.c
> +++ b/testsuites/libtests/termios04/init.c
> @@ -125,7 +125,7 @@ rtems_task Init(
> TERMIOS_TEST_DRIVER_TABLE_ENTRY
>
> /* we need to be able to open the test device */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_MAXIMUM_TIMERS 2
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
> diff --git a/testsuites/libtests/termios05/init.c
> b/testsuites/libtests/termios05/init.c
> index 6b980cc7af..38b2e13d9e 100644
> --- a/testsuites/libtests/termios05/init.c
> +++ b/testsuites/libtests/termios05/init.c
> @@ -153,7 +153,7 @@ rtems_task Init(
> TERMIOS_TEST_DRIVER_TABLE_ENTRY
>
> /* we need to be able to open the test device */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 4
> #define CONFIGURE_MAXIMUM_TIMERS 2
> diff --git a/testsuites/libtests/termios06/init.c
> b/testsuites/libtests/termios06/init.c
> index ead88e5e39..5104d1b724 100644
> --- a/testsuites/libtests/termios06/init.c
> +++ b/testsuites/libtests/termios06/init.c
> @@ -212,7 +212,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_EXTRA_DRIVERS
> TERMIOS_TEST_DRIVER_TABLE_ENTRY
>
> /* we need to be able to open the test device */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
> diff --git a/testsuites/libtests/termios07/init.c
> b/testsuites/libtests/termios07/init.c
> index f3d3500333..1dd5315126 100644
> --- a/testsuites/libtests/termios07/init.c
> +++ b/testsuites/libtests/termios07/init.c
> @@ -169,7 +169,7 @@ rtems_task Init(
> TERMIOS_TEST_DRIVER_TABLE_ENTRY
>
> /* we need to be able to open the test device */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_MAXIMUM_TIMERS 2
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
> diff --git a/testsuites/libtests/termios08/init.c
> b/testsuites/libtests/termios08/init.c
> index b6aa59e2ba..4f237fb367 100644
> --- a/testsuites/libtests/termios08/init.c
> +++ b/testsuites/libtests/termios08/init.c
> @@ -155,7 +155,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_EXTRA_DRIVERS
> TERMIOS_TEST_DRIVER_TABLE_ENTRY
>
> /* we need to be able to open the test device */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
> diff --git a/testsuites/libtests/termios09/init.c
> b/testsuites/libtests/termios09/init.c
> index 62138bc213..5490b2b918 100644
> --- a/testsuites/libtests/termios09/init.c
> +++ b/testsuites/libtests/termios09/init.c
> @@ -1188,7 +1188,7 @@ static void switch_extension(Thread_Control
> *executing, Thread_Control *heir)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 5
>
> #define CONFIGURE_MAXIMUM_TASKS 2
>
> diff --git a/testsuites/libtests/termios10/termios10impl.h
> b/testsuites/libtests/termios10/termios10impl.h
> index a01f203857..c2981ff80f 100644
> --- a/testsuites/libtests/termios10/termios10impl.h
> +++ b/testsuites/libtests/termios10/termios10impl.h
> @@ -178,7 +178,7 @@ static void *POSIX_Init(void *argument)
> TERMIOS_TEST_DRIVER_TABLE_ENTRY
>
> /* we need to be able to open the test device */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
> #define CONFIGURE_MAXIMUM_POSIX_THREADS 1
> #define CONFIGURE_MAXIMUM_TIMERS 2
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
> diff --git a/testsuites/libtests/ttest01/init.c
> b/testsuites/libtests/ttest01/init.c
> index 44ffadf112..b3ebfb5b73 100644
> --- a/testsuites/libtests/ttest01/init.c
> +++ b/testsuites/libtests/ttest01/init.c
> @@ -303,7 +303,7 @@ Init(rtems_task_argument arg)
>
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_BARRIERS 1
> #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
> diff --git a/testsuites/libtests/uid01/init.c
> b/testsuites/libtests/uid01/init.c
> index f71c0023ec..fcc3071345 100644
> --- a/testsuites/libtests/uid01/init.c
> +++ b/testsuites/libtests/uid01/init.c
> @@ -132,7 +132,7 @@ rtems_task Init(
> SERIAL_MOUSE_DRIVER_TABLE_ENTRY
>
> /* we need to be able to open the test device and mouse */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 5
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_MAXIMUM_TIMERS 2
> #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
> diff --git a/testsuites/psxtests/psx13/main.c
> b/testsuites/psxtests/psx13/main.c
> index 05909a2839..20788b353f 100644
> --- a/testsuites/psxtests/psx13/main.c
> +++ b/testsuites/psxtests/psx13/main.c
> @@ -35,7 +35,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 6
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/psxtests/psxaio01/system.h
> b/testsuites/psxtests/psxaio01/system.h
> index 3ffb398e48..f58a67e257 100644
> --- a/testsuites/psxtests/psxaio01/system.h
> +++ b/testsuites/psxtests/psxaio01/system.h
> @@ -23,7 +23,7 @@ void *POSIX_Init (void *argument);
> #define CONFIGURE_MAXIMUM_TASKS 20
> #define CONFIGURE_MAXIMUM_SEMAPHORES 20
> #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 20
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 20
>
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> diff --git a/testsuites/psxtests/psxaio02/system.h
> b/testsuites/psxtests/psxaio02/system.h
> index f3e348e12b..db0014fb43 100644
> --- a/testsuites/psxtests/psxaio02/system.h
> +++ b/testsuites/psxtests/psxaio02/system.h
> @@ -23,7 +23,7 @@ void *POSIX_Init (void *argument);
> #define CONFIGURE_MAXIMUM_TASKS 20
> #define CONFIGURE_MAXIMUM_SEMAPHORES 20
> #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 20
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 20
>
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> diff --git a/testsuites/psxtests/psxaio03/system.h
> b/testsuites/psxtests/psxaio03/system.h
> index 236ef19a91..066bf9e47e 100644
> --- a/testsuites/psxtests/psxaio03/system.h
> +++ b/testsuites/psxtests/psxaio03/system.h
> @@ -24,7 +24,7 @@ void *POSIX_Init (void *argument);
> #define CONFIGURE_MAXIMUM_TASKS 10
> #define CONFIGURE_MAXIMUM_SEMAPHORES 10
> #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 10
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 10
>
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> diff --git a/testsuites/psxtests/psxchroot01/main.c
> b/testsuites/psxtests/psxchroot01/main.c
> index 946fbb6073..4059dc9203 100644
> --- a/testsuites/psxtests/psxchroot01/main.c
> +++ b/testsuites/psxtests/psxchroot01/main.c
> @@ -28,7 +28,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 10
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/psxtests/psxconfig01/init.c
> b/testsuites/psxtests/psxconfig01/init.c
> index dc90373248..c17c433ff1 100644
> --- a/testsuites/psxtests/psxconfig01/init.c
> +++ b/testsuites/psxtests/psxconfig01/init.c
> @@ -45,7 +45,7 @@
>
> const char rtems_test_name[] = "PSXCONFIG 1";
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 5
>
> #define CONFIGURE_MAXIMUM_POSIX_KEYS 23
> #if CONFIGURE_MAXIMUM_POSIX_KEYS > 0
> @@ -263,8 +263,8 @@ static rtems_task Init(rtems_task_argument argument)
> rtems_test_assert(rtems_resource_snapshot_equal(&snapshot, &snapshot));
> rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
>
> -#if CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS > 0
> - for (i = 3; i < CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS; ++i) {
> +#if CONFIGURE_MAXIMUM_FILE_DESCRIPTORS > 0
> + for (i = 3; i < CONFIGURE_MAXIMUM_FILE_DESCRIPTORS; ++i) {
> int oflag = O_WRONLY | O_CREAT | O_TRUNC;
> mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
> char path [] = { 'F', 'I', 'L', 'E', 'A' + i, '\0' };
> @@ -273,7 +273,7 @@ static rtems_task Init(rtems_task_argument argument)
> }
> rtems_resource_snapshot_take(&snapshot);
> rtems_test_assert(
> - snapshot.open_files == CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS
> + snapshot.open_files == CONFIGURE_MAXIMUM_FILE_DESCRIPTORS
> );
> #endif
>
> diff --git a/testsuites/psxtests/psxfchx01/init.c
> b/testsuites/psxtests/psxfchx01/init.c
> index 82065ca9b2..081db4050e 100644
> --- a/testsuites/psxtests/psxfchx01/init.c
> +++ b/testsuites/psxtests/psxfchx01/init.c
> @@ -220,7 +220,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
> diff --git a/testsuites/psxtests/psxfenv01/init.c
> b/testsuites/psxtests/psxfenv01/init.c
> index 12e0722669..cdb0fa596e 100644
> --- a/testsuites/psxtests/psxfenv01/init.c
> +++ b/testsuites/psxtests/psxfenv01/init.c
> @@ -116,7 +116,7 @@ rtems_task Init(rtems_task_argument ignored)
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 6
>
> #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
>
> diff --git a/testsuites/psxtests/psxfile01/main.c
> b/testsuites/psxtests/psxfile01/main.c
> index 5ccdd6b7c7..1703602d39 100644
> --- a/testsuites/psxtests/psxfile01/main.c
> +++ b/testsuites/psxtests/psxfile01/main.c
> @@ -32,7 +32,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 6
>
> #define CONFIGURE_FILESYSTEM_IMFS
>
> diff --git a/testsuites/psxtests/psxfile02/init.c
> b/testsuites/psxtests/psxfile02/init.c
> index 7736185f35..e419d96310 100644
> --- a/testsuites/psxtests/psxfile02/init.c
> +++ b/testsuites/psxtests/psxfile02/init.c
> @@ -150,7 +150,7 @@ rtems_task Init(
>
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> diff --git a/testsuites/psxtests/psxfilelock01/init.c
> b/testsuites/psxtests/psxfilelock01/init.c
> index 533e6f6488..6ad9818be6 100644
> --- a/testsuites/psxtests/psxfilelock01/init.c
> +++ b/testsuites/psxtests/psxfilelock01/init.c
> @@ -57,7 +57,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> diff --git a/testsuites/psxtests/psxid01/init.c
> b/testsuites/psxtests/psxid01/init.c
> index 6935db7189..85cb40a7e9 100644
> --- a/testsuites/psxtests/psxid01/init.c
> +++ b/testsuites/psxtests/psxid01/init.c
> @@ -209,7 +209,7 @@ rtems_task Init(
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> /* so we can write /etc/passwd and /etc/group */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
> diff --git a/testsuites/psxtests/psximfs01/init.c
> b/testsuites/psxtests/psximfs01/init.c
> index 5a8845f1c6..f8bea196b7 100644
> --- a/testsuites/psxtests/psximfs01/init.c
> +++ b/testsuites/psxtests/psximfs01/init.c
> @@ -274,7 +274,7 @@ rtems_task Init(
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK 16
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
> diff --git a/testsuites/psxtests/psximfs02/init.c
> b/testsuites/psxtests/psximfs02/init.c
> index cfa6aa27d8..15b9137121 100644
> --- a/testsuites/psxtests/psximfs02/init.c
> +++ b/testsuites/psxtests/psximfs02/init.c
> @@ -204,7 +204,7 @@ rtems_task Init(
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK 16
> #define CONFIGURE_IMFS_ENABLE_MKFIFO
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> #define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_FLOATING_POINT
> diff --git a/testsuites/psxtests/psxmmap01/system.h
> b/testsuites/psxtests/psxmmap01/system.h
> index 055ad564d4..526465b5e9 100644
> --- a/testsuites/psxtests/psxmmap01/system.h
> +++ b/testsuites/psxtests/psxmmap01/system.h
> @@ -22,7 +22,7 @@ void *POSIX_Init(
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> #define CONFIGURE_MAXIMUM_POSIX_THREADS 1
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 10
> #define CONFIGURE_MAXIMUM_POSIX_SHMS 1
> #define CONFIGURE_MEMORY_OVERHEAD 10
>
> diff --git a/testsuites/psxtests/psxmount/main.c
> b/testsuites/psxtests/psxmount/main.c
> index e93ba339b3..6473e7c81e 100644
> --- a/testsuites/psxtests/psxmount/main.c
> +++ b/testsuites/psxtests/psxmount/main.c
> @@ -30,7 +30,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 10
>
> #define CONFIGURE_FILESYSTEM_IMFS
>
> diff --git a/testsuites/psxtests/psxndbm01/init.c
> b/testsuites/psxtests/psxndbm01/init.c
> index a0b918c183..d696abf282 100644
> --- a/testsuites/psxtests/psxndbm01/init.c
> +++ b/testsuites/psxtests/psxndbm01/init.c
> @@ -288,7 +288,7 @@ rtems_task Init(rtems_task_argument ignored)
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 6
>
> #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
>
> diff --git a/testsuites/psxtests/psxpasswd01/init.c
> b/testsuites/psxtests/psxpasswd01/init.c
> index 2845a47a2d..66dc5f0c49 100644
> --- a/testsuites/psxtests/psxpasswd01/init.c
> +++ b/testsuites/psxtests/psxpasswd01/init.c
> @@ -180,7 +180,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 6
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_MAXIMUM_POSIX_KEYS 1
> diff --git a/testsuites/psxtests/psxpasswd02/init.c
> b/testsuites/psxtests/psxpasswd02/init.c
> index 0bec2e29e2..ce250fce6e 100644
> --- a/testsuites/psxtests/psxpasswd02/init.c
> +++ b/testsuites/psxtests/psxpasswd02/init.c
> @@ -222,7 +222,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 6
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_MAXIMUM_POSIX_KEYS 1
> diff --git a/testsuites/psxtests/psxpipe01/init.c
> b/testsuites/psxtests/psxpipe01/init.c
> index f7e862fac5..90d4c5d8bc 100644
> --- a/testsuites/psxtests/psxpipe01/init.c
> +++ b/testsuites/psxtests/psxpipe01/init.c
> @@ -102,7 +102,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 5
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
> diff --git a/testsuites/psxtests/psxrdwrv/main.c
> b/testsuites/psxtests/psxrdwrv/main.c
> index f6fa762218..44eda9e0d9 100644
> --- a/testsuites/psxtests/psxrdwrv/main.c
> +++ b/testsuites/psxtests/psxrdwrv/main.c
> @@ -32,7 +32,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 6
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/psxtests/psxreaddir/main.c
> b/testsuites/psxtests/psxreaddir/main.c
> index 11f372dda4..238d8e9ff1 100644
> --- a/testsuites/psxtests/psxreaddir/main.c
> +++ b/testsuites/psxtests/psxreaddir/main.c
> @@ -28,7 +28,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 10
>
> #define CONFIGURE_FILESYSTEM_IMFS
>
> diff --git a/testsuites/psxtests/psxshm01/system.h
> b/testsuites/psxtests/psxshm01/system.h
> index 83e780aec6..846d92d4e3 100644
> --- a/testsuites/psxtests/psxshm01/system.h
> +++ b/testsuites/psxtests/psxshm01/system.h
> @@ -20,7 +20,7 @@ void *POSIX_Init(
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> #define CONFIGURE_MAXIMUM_POSIX_THREADS 1
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 10
> #define CONFIGURE_MAXIMUM_POSIX_SHMS 1
> #define CONFIGURE_MEMORY_OVERHEAD 10
>
> diff --git a/testsuites/psxtests/psxshm02/system.h
> b/testsuites/psxtests/psxshm02/system.h
> index 6b5a5a0bd9..90e40d2c5d 100644
> --- a/testsuites/psxtests/psxshm02/system.h
> +++ b/testsuites/psxtests/psxshm02/system.h
> @@ -20,7 +20,7 @@ void *POSIX_Init(
> #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
>
> #define CONFIGURE_MAXIMUM_POSIX_THREADS 1
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 10
> #define CONFIGURE_MAXIMUM_POSIX_SHMS 1
> #define CONFIGURE_MEMORY_OVERHEAD 10
>
> diff --git a/testsuites/psxtests/psxstat/main.c
> b/testsuites/psxtests/psxstat/main.c
> index d5af4d33cd..472b91848c 100644
> --- a/testsuites/psxtests/psxstat/main.c
> +++ b/testsuites/psxtests/psxstat/main.c
> @@ -32,7 +32,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 10
>
> #define CONFIGURE_FILESYSTEM_IMFS
>
> diff --git a/testsuites/samples/fileio/system.h
> b/testsuites/samples/fileio/system.h
> index 310d6baa2e..c2a99d1944 100644
> --- a/testsuites/samples/fileio/system.h
> +++ b/testsuites/samples/fileio/system.h
> @@ -55,7 +55,7 @@ rtems_task Init(
> /*
> * XXX: these values are higher than needed...
> */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 20
> #define CONFIGURE_STACK_CHECKER_ENABLED
> #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
>
> diff --git a/testsuites/samples/loopback/init.c
> b/testsuites/samples/loopback/init.c
> index 672eeedeb6..891225c5ed 100644
> --- a/testsuites/samples/loopback/init.c
> +++ b/testsuites/samples/loopback/init.c
> @@ -22,7 +22,7 @@ const char rtems_test_name[] = "LOOPBACK";
> #define CONFIGURE_MAXIMUM_TASKS 20
>
> #define CONFIGURE_MICROSECONDS_PER_TICK 10000
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 50
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 50
>
> #define CONFIGURE_INIT_TASK_STACK_SIZE (10*1024)
> #define CONFIGURE_INIT_TASK_PRIORITY 50
> diff --git a/testsuites/samples/minimum/init.c
> b/testsuites/samples/minimum/init.c
> index bffb2b0c03..d8f83b9d68 100644
> --- a/testsuites/samples/minimum/init.c
> +++ b/testsuites/samples/minimum/init.c
> @@ -55,7 +55,7 @@ static void *Init( uintptr_t ignored )
> /*
> * This test does not use any stdio.
> */
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 0
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 0
>
> /*
> * This may prevent us from running on every architecture but it
> diff --git a/testsuites/samples/pppd/system.h
> b/testsuites/samples/pppd/system.h
> index 21b6042873..f83212ed5a 100644
> --- a/testsuites/samples/pppd/system.h
> +++ b/testsuites/samples/pppd/system.h
> @@ -27,7 +27,7 @@ extern int pppdapp_initialize(void);
>
> #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 8
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 8
>
> #define CONFIGURE_UNIFIED_WORK_AREAS
>
> diff --git a/testsuites/sptests/spconsole01/init.c
> b/testsuites/sptests/spconsole01/init.c
> index 99cd7c6f0e..ebfb651fab 100644
> --- a/testsuites/sptests/spconsole01/init.c
> +++ b/testsuites/sptests/spconsole01/init.c
> @@ -316,7 +316,7 @@ static void Init(rtems_task_argument arg)
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 3
> #define CONFIGURE_MAXIMUM_SEMAPHORES 1
> diff --git a/testsuites/sptests/spfatal14/init.c
> b/testsuites/sptests/spfatal14/init.c
> index ffb1c491b6..e3b928c38c 100644
> --- a/testsuites/sptests/spfatal14/init.c
> +++ b/testsuites/sptests/spfatal14/init.c
> @@ -20,7 +20,7 @@
> #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE
> #define FATAL_ERROR_EXPECTED_ERROR
> INTERNAL_ERROR_LIBIO_STDOUT_FD_OPEN_FAILED
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 1
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 1
>
> static void force_error(void)
> {
> diff --git a/testsuites/sptests/spfatal15/init.c
> b/testsuites/sptests/spfatal15/init.c
> index fb8645849f..d5c5bc55a4 100644
> --- a/testsuites/sptests/spfatal15/init.c
> +++ b/testsuites/sptests/spfatal15/init.c
> @@ -19,7 +19,7 @@
> #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE
> #define FATAL_ERROR_EXPECTED_ERROR
> INTERNAL_ERROR_LIBIO_STDERR_FD_OPEN_FAILED
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 2
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 2
>
> static void force_error(void)
> {
> diff --git a/testsuites/sptests/spfifo01/init.c
> b/testsuites/sptests/spfifo01/init.c
> index e38b23e039..70895cc222 100644
> --- a/testsuites/sptests/spfifo01/init.c
> +++ b/testsuites/sptests/spfifo01/init.c
> @@ -61,7 +61,7 @@ rtems_task Init(rtems_task_argument not_used)
> #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/sptests/spfifo02/init.c
> b/testsuites/sptests/spfifo02/init.c
> index f3e105e71f..c9e9012532 100644
> --- a/testsuites/sptests/spfifo02/init.c
> +++ b/testsuites/sptests/spfifo02/init.c
> @@ -102,7 +102,7 @@ static rtems_task Init(
>
> #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 5
>
> #define CONFIGURE_IMFS_ENABLE_MKFIFO
>
> diff --git a/testsuites/sptests/spfifo03/init.c
> b/testsuites/sptests/spfifo03/init.c
> index 94de05af39..ec054d2aef 100644
> --- a/testsuites/sptests/spfifo03/init.c
> +++ b/testsuites/sptests/spfifo03/init.c
> @@ -205,7 +205,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 6
>
> #define CONFIGURE_MAXIMUM_TASKS 3
>
> diff --git a/testsuites/sptests/spfifo04/init.c
> b/testsuites/sptests/spfifo04/init.c
> index db71226046..4c85228d92 100644
> --- a/testsuites/sptests/spfifo04/init.c
> +++ b/testsuites/sptests/spfifo04/init.c
> @@ -100,7 +100,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 6
>
> #define CONFIGURE_MAXIMUM_TASKS 3
>
> diff --git a/testsuites/sptests/spfifo05/init.c
> b/testsuites/sptests/spfifo05/init.c
> index e9cff9c52e..c9ae0505c6 100644
> --- a/testsuites/sptests/spfifo05/init.c
> +++ b/testsuites/sptests/spfifo05/init.c
> @@ -261,7 +261,7 @@ rtems_task Init(
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
> #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 6
>
> #define CONFIGURE_MAXIMUM_TASKS 3
>
> diff --git a/testsuites/sptests/spintrcritical24/init.c
> b/testsuites/sptests/spintrcritical24/init.c
> index 4c74ee5929..785ebacadd 100644
> --- a/testsuites/sptests/spintrcritical24/init.c
> +++ b/testsuites/sptests/spintrcritical24/init.c
> @@ -135,7 +135,7 @@ static void Init(rtems_task_argument arg)
>
> #define CONFIGURE_MICROSECONDS_PER_TICK 1000
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
> #define CONFIGURE_MAXIMUM_TIMERS 1
> diff --git a/testsuites/sptests/spmkdir/init.c
> b/testsuites/sptests/spmkdir/init.c
> index 09421e7515..fb186e7e93 100644
> --- a/testsuites/sptests/spmkdir/init.c
> +++ b/testsuites/sptests/spmkdir/init.c
> @@ -109,7 +109,7 @@ static rtems_task Init(rtems_task_argument argument)
> #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_TASKS 1
>
> diff --git a/testsuites/sptests/spsysinit01/init.c
> b/testsuites/sptests/spsysinit01/init.c
> index e6f45baa3b..64c81c2b90 100644
> --- a/testsuites/sptests/spsysinit01/init.c
> +++ b/testsuites/sptests/spsysinit01/init.c
> @@ -944,7 +944,7 @@ static void *POSIX_Init(void *arg)
>
> #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
>
> -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
> +#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
>
> #define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1
>
> --
> 2.16.4
>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/devel/attachments/20191217/34a2755c/attachment-0001.html>
More information about the devel
mailing list