[rtems commit] config: Remove Ada configuration options
Sebastian Huber
sebh at rtems.org
Thu Dec 19 07:55:47 UTC 2019
Module: rtems
Branch: master
Commit: 88c198bfae6572fe7780c3bf5f3a59b981ed5f55
Changeset: http://git.rtems.org/rtems/commit/?id=88c198bfae6572fe7780c3bf5f3a59b981ed5f55
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Tue Dec 17 15:42:15 2019 +0100
config: Remove Ada configuration options
Update #3845.
---
cpukit/include/rtems/confdefs.h | 80 +++++++++-----------------------------
testsuites/ada/support/initimpl.h | 2 -
testsuites/ada/tmtests/tm21/init.c | 4 ++
3 files changed, 22 insertions(+), 64 deletions(-)
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index 43c840b..6a8f56f 100644
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -2314,43 +2314,6 @@ struct _reent *__getreent(void)
/**@}*/ /* end of POSIX API Configuration */
/**
- * @defgroup ConfigurationGNAT GNAT/RTEMS Configuration
- *
- * @addtogroup Configuration
- *
- * This modules includes configuration parameters for applications which
- * use GNAT/RTEMS. GNAT implements each Ada task as a POSIX thread.
- */
-/**@{*/
-#ifdef CONFIGURE_GNAT_RTEMS
- /**
- * This is the maximum number of Ada tasks which can be concurrently
- * in existence. Twenty (20) are required to run all tests in the
- * ACATS (formerly ACVC).
- */
- #ifndef CONFIGURE_MAXIMUM_ADA_TASKS
- #define CONFIGURE_MAXIMUM_ADA_TASKS 20
- #endif
-
- /**
- * This is the number of non-Ada tasks which invoked Ada code.
- */
- #ifndef CONFIGURE_MAXIMUM_FAKE_ADA_TASKS
- #define CONFIGURE_MAXIMUM_FAKE_ADA_TASKS 0
- #endif
-#else
- /** This defines he number of POSIX mutexes GNAT needs. */
- /** This defines he number of Ada tasks needed by the application. */
- #define CONFIGURE_MAXIMUM_ADA_TASKS 0
- /**
- * This defines he number of non-Ada tasks/threads that will invoke
- * Ada subprograms or functions.
- */
- #define CONFIGURE_MAXIMUM_FAKE_ADA_TASKS 0
-#endif
-/**@}*/ /* end of GNAT Configuration */
-
-/**
* This is so we can account for tasks with stacks greater than minimum
* size. This is in bytes.
*/
@@ -2358,13 +2321,6 @@ struct _reent *__getreent(void)
#define CONFIGURE_EXTRA_TASK_STACKS 0
#endif
-/**
- * This macro provides a summation of the various POSIX thread requirements.
- */
-#define _CONFIGURE_POSIX_THREADS \
- (CONFIGURE_MAXIMUM_POSIX_THREADS + \
- CONFIGURE_MAXIMUM_ADA_TASKS)
-
/*
* We must be able to split the free block used for the second last allocation
* into two parts so that we have a free block for the last allocation. See
@@ -2546,14 +2502,6 @@ struct _reent *__getreent(void)
(_Configure_Max_Objects( CONFIGURE_MAXIMUM_POSIX_THREADS ) * \
_Configure_From_stackspace( CONFIGURE_MINIMUM_POSIX_THREAD_STACK_SIZE ) )
-/*
- * This macro is calculated to specify the memory required for
- * the stacks of all Ada tasks.
- */
-#define _CONFIGURE_ADA_TASKS_STACK \
- (_Configure_Max_Objects( CONFIGURE_MAXIMUM_ADA_TASKS ) * \
- _Configure_From_stackspace( CONFIGURE_MINIMUM_POSIX_THREAD_STACK_SIZE ) )
-
#else /* CONFIGURE_EXECUTIVE_RAM_SIZE */
#define _CONFIGURE_IDLE_TASKS_STACK 0
@@ -2561,7 +2509,6 @@ struct _reent *__getreent(void)
#define _CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS 0
#define _CONFIGURE_TASKS_STACK 0
#define _CONFIGURE_POSIX_THREADS_STACK 0
-#define _CONFIGURE_ADA_TASKS_STACK 0
#if CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK != 0
#error "CONFIGURE_EXECUTIVE_RAM_SIZE defined with request for CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK"
@@ -2584,7 +2531,6 @@ struct _reent *__getreent(void)
_CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS + \
_CONFIGURE_TASKS_STACK + \
_CONFIGURE_POSIX_THREADS_STACK + \
- _CONFIGURE_ADA_TASKS_STACK + \
CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK + \
_CONFIGURE_LIBBLOCK_TASK_EXTRA_STACKS + \
CONFIGURE_EXTRA_TASK_STACKS + \
@@ -2713,7 +2659,7 @@ struct _reent *__getreent(void)
const size_t _Thread_Initial_thread_count = _CONFIGURE_IDLE_TASKS_COUNT +
_CONFIGURE_MPCI_RECEIVE_SERVER_COUNT +
rtems_resource_maximum_per_allocation( _CONFIGURE_TASKS ) +
- rtems_resource_maximum_per_allocation( _CONFIGURE_POSIX_THREADS );
+ rtems_resource_maximum_per_allocation( CONFIGURE_MAXIMUM_POSIX_THREADS );
THREAD_INFORMATION_DEFINE(
_Thread,
@@ -2807,7 +2753,7 @@ struct _reent *__getreent(void)
POSIX_SHM_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_POSIX_SHMS );
#endif
- #if _CONFIGURE_POSIX_THREADS > 0
+ #if CONFIGURE_MAXIMUM_POSIX_THREADS > 0
THREAD_INFORMATION_DEFINE(
_POSIX_Threads,
OBJECTS_POSIX_API,
@@ -3029,12 +2975,10 @@ struct _reent *__getreent(void)
* tasks/threads so there is a smaller set of calls to _Workspace_Allocate
* to analyze.
*/
-#if !defined(CONFIGURE_IDLE_TASK_INITIALIZES_APPLICATION)
- #if (CONFIGURE_MAXIMUM_TASKS == 0) && \
- (CONFIGURE_MAXIMUM_POSIX_THREADS == 0) && \
- (CONFIGURE_MAXIMUM_ADA_TASKS == 0)
- #error "CONFIGURATION ERROR: No tasks or threads configured!!"
- #endif
+#if !defined(CONFIGURE_IDLE_TASK_INITIALIZES_APPLICATION) \
+ && CONFIGURE_MAXIMUM_TASKS == 0 \
+ && CONFIGURE_MAXIMUM_POSIX_THREADS == 0
+ #error "CONFIGURATION ERROR: No tasks or threads configured!!"
#endif
#ifndef RTEMS_SCHEDSIM
@@ -3138,6 +3082,14 @@ struct _reent *__getreent(void)
#warning "The CONFIGURE_NUMBER_OF_TERMIOS_PORTS configuration option is obsolete since RTEMS 5.1"
#endif
+#ifdef CONFIGURE_MAXIMUM_ADA_TASKS
+ #warning "The CONFIGURE_MAXIMUM_ADA_TASKS configuration option is obsolete since RTEMS 5.1"
+#endif
+
+#ifdef CONFIGURE_MAXIMUM_FAKE_ADA_TASKS
+ #warning "The CONFIGURE_MAXIMUM_FAKE_ADA_TASKS configuration option is obsolete since RTEMS 5.1"
+#endif
+
#ifdef CONFIGURE_MAXIMUM_MRSP_SEMAPHORES
#warning "The CONFIGURE_MAXIMUM_MRSP_SEMAPHORES configuration option is obsolete since RTEMS 5.1"
#endif
@@ -3202,6 +3154,10 @@ struct _reent *__getreent(void)
#warning "The CONFIGURE_ENABLE_GO configuration option is obsolete since RTEMS 5.1"
#endif
+#ifdef CONFIGURE_GNAT_RTEMS
+ #warning "The CONFIGURE_GNAT_RTEMS configuration option is obsolete since RTEMS 5.1"
+#endif
+
#ifdef CONFIGURE_MAXIMUM_GOROUTINES
#warning "The CONFIGURE_MAXIMUM_GOROUTINES configuration option is obsolete since RTEMS 5.1"
#endif
diff --git a/testsuites/ada/support/initimpl.h b/testsuites/ada/support/initimpl.h
index 5e3457f..4d4165a 100644
--- a/testsuites/ada/support/initimpl.h
+++ b/testsuites/ada/support/initimpl.h
@@ -46,8 +46,6 @@ void check_type(long type, long size, long alignment);
* path and can get this file from ".." in the mptests.
*/
#define CONFIGURE_INIT
-#define CONFIGURE_GNAT_RTEMS
-#define CONFIGURE_MEMORY_OVERHEAD (256)
#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
diff --git a/testsuites/ada/tmtests/tm21/init.c b/testsuites/ada/tmtests/tm21/init.c
index a3646f3..04e0bc9 100644
--- a/testsuites/ada/tmtests/tm21/init.c
+++ b/testsuites/ada/tmtests/tm21/init.c
@@ -30,6 +30,10 @@
#define CONFIGURE_MAXIMUM_PERIODS 100
#define CONFIGURE_TICKS_PER_TIMESLICE 0
+#define CONFIGURE_MESSAGE_BUFFER_MEMORY \
+ (CONFIGURE_MAXIMUM_MESSAGE_QUEUES \
+ * CONFIGURE_MESSAGE_BUFFERS_FOR_QUEUE(100, 16))
+
#define CONFIGURE_POSIX_INIT_THREAD_TABLE
#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
More information about the vc
mailing list