summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2019-12-17 09:17:43 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2019-12-19 08:53:03 +0100
commit3cec2dfbc427db269c1d2de5a235723886b516e2 (patch)
tree4e9e344f6fad59cd1bb9d125cfd1b88a6195b3db /cpukit
parentconfig: CONFIGURE_HAS_OWN_DEVICE_DRIVER_TABLE (diff)
downloadrtems-3cec2dfbc427db269c1d2de5a235723886b516e2.tar.bz2
config: CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS
Rename CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS into CONFIGURE_MAXIMUM_FILE_DESCRIPTORS. Update #3753.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/include/rtems/confdefs.h11
-rw-r--r--cpukit/libmisc/dummy/default-configuration.c2
2 files changed, 9 insertions, 4 deletions
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index 0be4e78508..43c840bef2 100644
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -143,13 +143,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
/*
@@ -158,7 +163,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