Re: [PATCH v2] config: Add
Thanks looks good to me.
On Sat, Feb 15, 2020 at 10:58 AM Sebastian Huber <
sebastian.hu...@embedded-brains.de> wrote:
> Unify handling of obsolete configuration options. Change license to
> BSD-2-Clause.
>
> Update #3053.
> Update #3875.
> ---
> cpukit/header-dirs.am| 2 +
> cpukit/headers.am| 1 +
> cpukit/include/rtems/confdefs.h | 167 +-
> cpukit/include/rtems/confdefs/obsolete.h | 234
> +++
> 4 files changed, 238 insertions(+), 166 deletions(-)
> create mode 100644 cpukit/include/rtems/confdefs/obsolete.h
>
> diff --git a/cpukit/header-dirs.am b/cpukit/header-dirs.am
> index 7197f1a29f..d90271be9e 100644
> --- a/cpukit/header-dirs.am
> +++ b/cpukit/header-dirs.am
> @@ -50,6 +50,8 @@ include_rtems_bfindir = $(includedir)/rtems/bfin
> include_rtems_bfin_HEADERS =
> include_rtems_bsdnetdir = $(includedir)/rtems/bsdnet
> include_rtems_bsdnet_HEADERS =
> +include_rtems_confdefsdir = $(includedir)/rtems/confdefs
> +include_rtems_confdefs_HEADERS =
> include_rtems_debuggerdir = $(includedir)/rtems/debugger
> include_rtems_debugger_HEADERS =
> include_rtems_m68kdir = $(includedir)/rtems/m68k
> diff --git a/cpukit/headers.am b/cpukit/headers.am
> index 6e1ab4ccd0..f0c8319dcb 100644
> --- a/cpukit/headers.am
> +++ b/cpukit/headers.am
> @@ -183,6 +183,7 @@ include_rtems_HEADERS += include/rtems/userenv.h
> include_rtems_HEADERS += include/rtems/version.h
> include_rtems_HEADERS += include/rtems/vmeintr.h
> include_rtems_HEADERS += include/rtems/watchdogdrv.h
> +include_rtems_confdefs_HEADERS += include/rtems/confdefs/obsolete.h
> include_rtems_debugger_HEADERS +=
> include/rtems/debugger/rtems-debugger-bsp.h
> include_rtems_debugger_HEADERS +=
> include/rtems/debugger/rtems-debugger-remote.h
> include_rtems_debugger_HEADERS +=
> include/rtems/debugger/rtems-debugger-server.h
> diff --git a/cpukit/include/rtems/confdefs.h
> b/cpukit/include/rtems/confdefs.h
> index e0d4a77075..0b3b2af546 100644
> --- a/cpukit/include/rtems/confdefs.h
> +++ b/cpukit/include/rtems/confdefs.h
> @@ -50,6 +50,7 @@
> #include
> #include
> #include
> +#include
>
> #include
>
> @@ -138,11 +139,6 @@ extern "C" {
> #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
> @@ -167,11 +163,6 @@ extern "C" {
>const uint32_t rtems_libio_number_iops =
> RTEMS_ARRAY_SIZE(rtems_libio_iops);
> #endif
>
> -#ifdef CONFIGURE_SMP_MAXIMUM_PROCESSORS
> - #warning "CONFIGURE_SMP_MAXIMUM_PROCESSORS has been renamed to
> CONFIGURE_MAXIMUM_PROCESSORS since RTEMS 5.1"
> - #define CONFIGURE_MAXIMUM_PROCESSORS CONFIGURE_SMP_MAXIMUM_PROCESSORS
> -#endif
> -
> /* Ensure that _CONFIGURE_MAXIMUM_PROCESSORS > 1 only in SMP
> configurations */
> #if defined(CONFIGURE_MAXIMUM_PROCESSORS) && defined(RTEMS_SMP)
>#define _CONFIGURE_MAXIMUM_PROCESSORS CONFIGURE_MAXIMUM_PROCESSORS
> @@ -191,34 +182,10 @@ extern "C" {
>#endif
> #endif
>
> -#ifdef CONFIGURE_SMP_APPLICATION
> - #warning "CONFIGURE_SMP_APPLICATION is obsolete since RTEMS 5.1"
> -#endif
> -
> /*
> * This sets up the resources for the FIFOs/pipes.
> */
>
> -/**
> - * This is specified to configure the maximum number of POSIX FIFOs.
> - */
> -#ifdef CONFIGURE_MAXIMUM_FIFOS
> - #warning "CONFIGURE_MAXIMUM_FIFOS is obsolete since RTEMS 5.1; use
> CONFIGURE_IMFS_ENABLE_MKFIFO instead"
> - #if CONFIGURE_MAXIMUM_FIFOS > 0
> -#define CONFIGURE_IMFS_ENABLE_MKFIFO
> - #endif
> -#endif
> -
> -/**
> - * This is specified to configure the maximum number of POSIX named pipes.
> - */
> -#ifdef CONFIGURE_MAXIMUM_PIPES
> - #warning "CONFIGURE_MAXIMUM_PIPES is obsolete since RTEMS 5.1; use
> CONFIGURE_IMFS_ENABLE_MKFIFO instead"
> - #if CONFIGURE_MAXIMUM_PIPES > 0
> -#define CONFIGURE_IMFS_ENABLE_MKFIFO
> - #endif
> -#endif
> -
> /**
> * @defgroup ConfigFilesystems Filesystems and Mount Table Configuration
> *
> @@ -617,14 +584,6 @@ extern "C" {
> #endif
> /**@}*/ /* end of file system group */
>
> -/*
> - * STACK_CHECKER_ON was still available in 4.9 so give a warning for now.
> - */
> -#if defined(STACK_CHECKER_ON)
> - #define CONFIGURE_STACK_CHECKER_ENABLED
> - #warning "STACK_CHECKER_ON deprecated -- use
> CONFIGURE_STACK_CHECKER_ENABLED"
> -#endif
> -
> /**
> * This configures the stack checker user extension.
> */
> @@ -702,21 +661,6 @@ extern "C" {
> *- CONFIGURE_SCHEDULER_USER_PER_THREAD
> */
>
> -#ifdef CONFIGURE_SCHEDULER_CONTEXT
> - #warning "CONFIGURE_SCHEDULER_CONTEXT has been renamed to
> CONFIGURE_SCHEDULER since RTEMS 5.1"
[PATCH v2] config: Add
Unify handling of obsolete configuration options. Change license to
BSD-2-Clause.
Update #3053.
Update #3875.
---
cpukit/header-dirs.am| 2 +
cpukit/headers.am| 1 +
cpukit/include/rtems/confdefs.h | 167 +-
cpukit/include/rtems/confdefs/obsolete.h | 234 +++
4 files changed, 238 insertions(+), 166 deletions(-)
create mode 100644 cpukit/include/rtems/confdefs/obsolete.h
diff --git a/cpukit/header-dirs.am b/cpukit/header-dirs.am
index 7197f1a29f..d90271be9e 100644
--- a/cpukit/header-dirs.am
+++ b/cpukit/header-dirs.am
@@ -50,6 +50,8 @@ include_rtems_bfindir = $(includedir)/rtems/bfin
include_rtems_bfin_HEADERS =
include_rtems_bsdnetdir = $(includedir)/rtems/bsdnet
include_rtems_bsdnet_HEADERS =
+include_rtems_confdefsdir = $(includedir)/rtems/confdefs
+include_rtems_confdefs_HEADERS =
include_rtems_debuggerdir = $(includedir)/rtems/debugger
include_rtems_debugger_HEADERS =
include_rtems_m68kdir = $(includedir)/rtems/m68k
diff --git a/cpukit/headers.am b/cpukit/headers.am
index 6e1ab4ccd0..f0c8319dcb 100644
--- a/cpukit/headers.am
+++ b/cpukit/headers.am
@@ -183,6 +183,7 @@ include_rtems_HEADERS += include/rtems/userenv.h
include_rtems_HEADERS += include/rtems/version.h
include_rtems_HEADERS += include/rtems/vmeintr.h
include_rtems_HEADERS += include/rtems/watchdogdrv.h
+include_rtems_confdefs_HEADERS += include/rtems/confdefs/obsolete.h
include_rtems_debugger_HEADERS += include/rtems/debugger/rtems-debugger-bsp.h
include_rtems_debugger_HEADERS +=
include/rtems/debugger/rtems-debugger-remote.h
include_rtems_debugger_HEADERS +=
include/rtems/debugger/rtems-debugger-server.h
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index e0d4a77075..0b3b2af546 100644
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -50,6 +50,7 @@
#include
#include
#include
+#include
#include
@@ -138,11 +139,6 @@ extern "C" {
#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
@@ -167,11 +163,6 @@ extern "C" {
const uint32_t rtems_libio_number_iops = RTEMS_ARRAY_SIZE(rtems_libio_iops);
#endif
-#ifdef CONFIGURE_SMP_MAXIMUM_PROCESSORS
- #warning "CONFIGURE_SMP_MAXIMUM_PROCESSORS has been renamed to
CONFIGURE_MAXIMUM_PROCESSORS since RTEMS 5.1"
- #define CONFIGURE_MAXIMUM_PROCESSORS CONFIGURE_SMP_MAXIMUM_PROCESSORS
-#endif
-
/* Ensure that _CONFIGURE_MAXIMUM_PROCESSORS > 1 only in SMP configurations */
#if defined(CONFIGURE_MAXIMUM_PROCESSORS) && defined(RTEMS_SMP)
#define _CONFIGURE_MAXIMUM_PROCESSORS CONFIGURE_MAXIMUM_PROCESSORS
@@ -191,34 +182,10 @@ extern "C" {
#endif
#endif
-#ifdef CONFIGURE_SMP_APPLICATION
- #warning "CONFIGURE_SMP_APPLICATION is obsolete since RTEMS 5.1"
-#endif
-
/*
* This sets up the resources for the FIFOs/pipes.
*/
-/**
- * This is specified to configure the maximum number of POSIX FIFOs.
- */
-#ifdef CONFIGURE_MAXIMUM_FIFOS
- #warning "CONFIGURE_MAXIMUM_FIFOS is obsolete since RTEMS 5.1; use
CONFIGURE_IMFS_ENABLE_MKFIFO instead"
- #if CONFIGURE_MAXIMUM_FIFOS > 0
-#define CONFIGURE_IMFS_ENABLE_MKFIFO
- #endif
-#endif
-
-/**
- * This is specified to configure the maximum number of POSIX named pipes.
- */
-#ifdef CONFIGURE_MAXIMUM_PIPES
- #warning "CONFIGURE_MAXIMUM_PIPES is obsolete since RTEMS 5.1; use
CONFIGURE_IMFS_ENABLE_MKFIFO instead"
- #if CONFIGURE_MAXIMUM_PIPES > 0
-#define CONFIGURE_IMFS_ENABLE_MKFIFO
- #endif
-#endif
-
/**
* @defgroup ConfigFilesystems Filesystems and Mount Table Configuration
*
@@ -617,14 +584,6 @@ extern "C" {
#endif
/**@}*/ /* end of file system group */
-/*
- * STACK_CHECKER_ON was still available in 4.9 so give a warning for now.
- */
-#if defined(STACK_CHECKER_ON)
- #define CONFIGURE_STACK_CHECKER_ENABLED
- #warning "STACK_CHECKER_ON deprecated -- use CONFIGURE_STACK_CHECKER_ENABLED"
-#endif
-
/**
* This configures the stack checker user extension.
*/
@@ -702,21 +661,6 @@ extern "C" {
*- CONFIGURE_SCHEDULER_USER_PER_THREAD
*/
-#ifdef CONFIGURE_SCHEDULER_CONTEXT
- #warning "CONFIGURE_SCHEDULER_CONTEXT has been renamed to
CONFIGURE_SCHEDULER since RTEMS 5.1"
- #define CONFIGURE_SCHEDULER CONFIGURE_SCHEDULER_CONTEXT
-#endif
-
-#ifdef CONFIGURE_SCHEDULER_CONTROLS
- #warning "CONFIGURE_SCHEDULER_CONTROLS has been renamed to
CONFIGURE_SCHEDULER_TABLE_ENTRIES since RTEMS 5.1"
- #define CONFIGURE_SCHEDULER_TABLE_ENTRIES CONFIGURE_SCHEDULER_CONTROLS
-#endif
-
-#ifdef CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS
- #warning "CONFIGURE_SMP_SCHEDULE
