diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-06-08 13:53:29 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-06-08 13:53:29 +0000 |
| commit | 304d1a52df48d3c3e180a8be2e6afe44fcc686b9 (patch) | |
| tree | 2e0e02123ae9211ac5ff314431880f1dc4880d97 /cpukit/sapi | |
| parent | 2004-05-22 Till Strauman <strauman@slac.stanford.edu> (diff) | |
| download | rtems-304d1a52df48d3c3e180a8be2e6afe44fcc686b9.tar.bz2 | |
2004-06-08 Joel Sherrill <joel@OARcorp.com>
* ChangeLog, include/confdefs.h: Reverse previous accidental commit
which included too much and had no PR.
Diffstat (limited to 'cpukit/sapi')
| -rw-r--r-- | cpukit/sapi/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/sapi/include/confdefs.h | 31 |
2 files changed, 8 insertions, 28 deletions
diff --git a/cpukit/sapi/ChangeLog b/cpukit/sapi/ChangeLog index 9db03d3f6d..9c5f9bc7fc 100644 --- a/cpukit/sapi/ChangeLog +++ b/cpukit/sapi/ChangeLog @@ -1,6 +1,7 @@ -2004-03-05 Joel Sherrill <joel@OARcorp.com> +2004-06-08 Joel Sherrill <joel@OARcorp.com> - * include/confdefs.h: + * ChangeLog, include/confdefs.h: Reverse previous accidental commit + which included too much and had no PR. 2003-09-04 Joel Sherrill <joel@OARcorp.com> diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index 6ddb2ea68a..42dabaa8d9 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -44,7 +44,6 @@ extern "C" { * Include the executive's configuration */ #include <rtems/score/cpuopts.h> -#include <rtems/score/apimutex.h> extern rtems_initialization_tasks_table Initialization_tasks[]; extern rtems_driver_address_table Device_drivers[]; @@ -473,7 +472,6 @@ rtems_extensions_table Configuration_Initial_Extensions[] = { #include <sys/types.h> #include <signal.h> -#include <limits.h> #include <mqueue.h> #include <rtems/posix/cond.h> #include <rtems/posix/mqueue.h> @@ -564,8 +562,7 @@ posix_initialization_threads_table POSIX_Initialization_threads[] = { #define CONFIGURE_MEMORY_FOR_POSIX_MUTEXES(_mutexes) \ ((_mutexes) * \ - ( sizeof(POSIX_Mutex_Control) + CONFIGURE_OBJECT_TABLE_STUFF + \ - NAME_MAX ) ) + ( sizeof(POSIX_Mutex_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) ) #define CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES(_condition_variables) \ ((_condition_variables) * \ @@ -586,14 +583,11 @@ posix_initialization_threads_table POSIX_Initialization_threads[] = { #define CONFIGURE_MEMORY_FOR_POSIX_MESSAGE_QUEUES(_message_queues) \ ((_message_queues) * \ - ( sizeof( POSIX_Message_queue_Control) + \ - CONFIGURE_OBJECT_TABLE_STUFF + \ - NAME_MAX ) ) + ( sizeof( POSIX_Message_queue_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) ) #define CONFIGURE_MEMORY_FOR_POSIX_SEMAPHORES(_semaphores) \ ((_semaphores) * \ - ( sizeof( POSIX_Semaphore_Control) + \ - CONFIGURE_OBJECT_TABLE_STUFF + \ - NAME_MAX ) ) + ( sizeof( POSIX_Semaphore_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) ) + #define CONFIGURE_MEMORY_FOR_POSIX \ ( \ @@ -811,21 +805,12 @@ itron_initialization_tasks_table ITRON_Initialization_tasks[] = { #define CONFIGURE_OBJECT_TABLE_STUFF \ ( sizeof(Objects_Control *) + sizeof(rtems_name *) + sizeof(rtems_name) ) -#if defined(RTEMS_NEWLIB) -#include <reent.h> - -#define CONFIGURE_MEMORY_PER_TASK_FOR_LIBC_REENTRANCY sizeof(struct _reent) -#else -#define CONFIGURE_MEMORY_PER_TASK_FOR_LIBC_REENTRANCY 0 -#endif - #define CONFIGURE_MEMORY_FOR_TASKS(_tasks) \ (((_tasks) + 1 ) * \ ((sizeof(Thread_Control) + CONTEXT_FP_SIZE + \ STACK_MINIMUM_SIZE + sizeof( RTEMS_API_Control ) + \ CONFIGURE_MEMORY_PER_TASK_FOR_POSIX_API + \ CONFIGURE_MEMORY_PER_TASK_FOR_ITRON_API + \ - CONFIGURE_MEMORY_PER_TASK_FOR_LIBC_REENTRANCY + \ CONFIGURE_OBJECT_TABLE_STUFF)) \ ) @@ -895,17 +880,11 @@ itron_initialization_tasks_table ITRON_Initialization_tasks[] = { #define CONFIGURE_EXTRA_TASK_STACKS 0 #endif -#define CONFIGURE_API_MUTEX_MEMORY \ - ( (1) * \ - ( sizeof(API_Mutex_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) \ - ) - #define CONFIGURE_MEMORY_FOR_SYSTEM_OVERHEAD \ ( CONFIGURE_MEMORY_FOR_TASKS(1) + /* IDLE */ \ (256 * 12) + /* Ready chains */ \ 256 + /* name/ptr table overhead */ \ - CONFIGURE_INTERRUPT_STACK_MEMORY + /* interrupt stack */ \ - CONFIGURE_API_MUTEX_MEMORY /* allocation mutex */ \ + CONFIGURE_INTERRUPT_STACK_MEMORY /* interrupt stack */ \ ) /* |