Update #3845.
---
cpukit/include/rtems/confdefs.h | 80 ++++++++++-------------------------------
1 file changed, 18 insertions(+), 62 deletions(-)
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index f4ada7ead4..ae0c9874a6 100644
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -2300,43 +2300,6 @@ struct _reent *__getreent(void)
#endif
/**@}*/ /* 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.
@@ -2345,13 +2308,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
@@ -2478,20 +2434,11 @@ 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_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"
@@ -2512,7 +2459,6 @@ struct _reent *__getreent(void)
_CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS + \
_CONFIGURE_TASKS_STACK + \
_CONFIGURE_POSIX_THREADS_STACK + \
- _CONFIGURE_ADA_TASKS_STACK + \
_CONFIGURE_LIBBLOCK_TASK_EXTRA_STACKS + \
CONFIGURE_EXTRA_TASK_STACKS + \
_CONFIGURE_HEAP_HANDLER_OVERHEAD \
@@ -2639,7 +2585,7 @@ struct _reent *__getreent(void)
const size_t _Thread_Initial_thread_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,
@@ -2740,7 +2686,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,
@@ -2978,12 +2924,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
@@ -3087,6 +3031,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
@@ -3151,6 +3103,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
--
2.16.4
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
