diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-11-24 19:48:59 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-11-24 19:48:59 +0000 |
| commit | f82452b0ee0886d8e0b654a8f95680f7e151e409 (patch) | |
| tree | c774a044bdf1992aa436a96538e2948286fcde24 /cpukit | |
| parent | 2008-11-20 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-f82452b0ee0886d8e0b654a8f95680f7e151e409.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')
| -rw-r--r-- | cpukit/ChangeLog | 12 | ||||
| -rw-r--r-- | cpukit/sapi/include/confdefs.h | 31 |
2 files changed, 26 insertions, 17 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index fc1aea29c2..12de591fbf 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,15 @@ +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. + 2008-11-20 Joel Sherrill <joel.sherrill@OARcorp.com> PR 1340/cpukit diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index acc03b7434..4881ec2221 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -289,7 +289,8 @@ extern rtems_configuration_table Configuration; #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 /** @@ -744,10 +745,11 @@ extern rtems_configuration_table Configuration; #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 /** @@ -856,14 +858,6 @@ extern rtems_configuration_table Configuration; #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 */ @@ -1421,10 +1415,12 @@ extern rtems_configuration_table Configuration; * 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 @@ -1527,10 +1523,11 @@ extern rtems_configuration_table Configuration; * 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 |