diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-11-24 19:50:06 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-11-24 19:50:06 +0000 |
| commit | 94a88c1c954af0967e79fe3a1b98973df0b60733 (patch) | |
| tree | 4b54c873d9297eccd78c9be3b966f263004b076a /cpukit/sapi/include/confdefs.h | |
| parent | 2008-11-24 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-94a88c1c954af0967e79fe3a1b98973df0b60733.tar.bz2 | |
2008-11-24 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1341/cpukit
* sapi/include/confdefs.h: The following macros were missing
the _Configure_From_workspace() wrapper on their size estimate:
+ CONFIGURE_INTERRUPT_STACK_MEMORY
+ CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API
+ CONFIGURE_INTERRUPT_VECTOR_TABLE
+ CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS
In addition, there was a duplicate definition of
CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API.
Diffstat (limited to 'cpukit/sapi/include/confdefs.h')
| -rw-r--r-- | cpukit/sapi/include/confdefs.h | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index d96f2bb3ef..0e7170f625 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -346,7 +346,8 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #if (CPU_ALLOCATE_INTERRUPT_STACK == 0) #define CONFIGURE_INTERRUPT_STACK_MEMORY 0 #else - #define CONFIGURE_INTERRUPT_STACK_MEMORY CONFIGURE_INTERRUPT_STACK_SIZE + #define CONFIGURE_INTERRUPT_STACK_MEMORY \ + _Configure_From_workspace( CONFIGURE_INTERRUPT_STACK_SIZE ) #endif /** @@ -809,10 +810,11 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #ifndef CONFIGURE_DISABLE_CLASSIC_NOTEPADS #define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \ - sizeof(RTEMS_API_Control) + _Configure_From_workspace( sizeof(RTEMS_API_Control) ) #else #define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \ - (sizeof(RTEMS_API_Control) - (RTEMS_NUMBER_NOTEPADS * sizeof(uint32_t))) + _Configure_From_workspace( sizeof(RTEMS_API_Control) - \ + (RTEMS_NUMBER_NOTEPADS * sizeof(uint32_t))) #endif /** @@ -921,14 +923,6 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #define CONFIGURE_TICKS_PER_TIMESLICE 50 #endif - #ifndef CONFIGURE_DISABLE_CLASSIC_NOTEPADS - #define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \ - sizeof(RTEMS_API_Control) - #else - #define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \ - (sizeof(RTEMS_API_Control) - (RTEMS_NUMBER_NOTEPADS * sizeof(uint32_t))) - #endif - /* * Initial Extension Set */ @@ -1486,10 +1480,12 @@ rtems_fs_init_functions_t rtems_fs_init_helper = * solution. */ #if defined(__mips__) - #define CONFIGURE_INTERRUPT_VECTOR_TABLE (sizeof(ISR_Handler_entry) * 256) + #define CONFIGURE_INTERRUPT_VECTOR_TABLE \ + _Configure_From_workspace( (sizeof(ISR_Handler_entry) * 256)) #else #define CONFIGURE_INTERRUPT_VECTOR_TABLE \ - (sizeof(ISR_Handler_entry) * ISR_NUMBER_OF_VECTORS) + _Configure_From_workspace( \ + (sizeof(ISR_Handler_entry) * ISR_NUMBER_OF_VECTORS)) #endif #else #define CONFIGURE_INTERRUPT_VECTOR_TABLE 0 @@ -1592,10 +1588,11 @@ rtems_fs_init_functions_t rtems_fs_init_helper = * user extensions. */ #define CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS \ - _Configure_From_workspace( \ - (CONFIGURE_NEWLIB_EXTENSION + CONFIGURE_STACK_CHECKER_EXTENSION) * \ - sizeof(User_extensions_Control) \ - ) + ((CONFIGURE_NEWLIB_EXTENSION * \ + _Configure_From_workspace( sizeof(User_extensions_Control))) + \ + (CONFIGURE_STACK_CHECKER_EXTENSION * \ + _Configure_From_workspace( sizeof(User_extensions_Control))) \ + ) /** * This macro provides a summation of the memory required by the |