RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-11-24 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
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.
This commit is contained in:
Joel Sherrill
2008-11-24 19:50:06 +00:00
parent ea5c9c660f
commit 94a88c1c95
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cpukit/ChangeLog
View File

@@ -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-24 Ralf Corsépius <ralf.corsepius@rtems.org> 2008-11-24 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Add AC_CHECK_FUNC's to check functions migrating * configure.ac: Add AC_CHECK_FUNC's to check functions migrating

29
cpukit/sapi/include/confdefs.h
View File

@@ -346,7 +346,8 @@ rtems_fs_init_functions_t rtems_fs_init_helper =
#if (CPU_ALLOCATE_INTERRUPT_STACK == 0) #if (CPU_ALLOCATE_INTERRUPT_STACK == 0)
#define CONFIGURE_INTERRUPT_STACK_MEMORY 0 #define CONFIGURE_INTERRUPT_STACK_MEMORY 0
#else #else
#define CONFIGURE_INTERRUPT_STACK_MEMORY CONFIGURE_INTERRUPT_STACK_SIZE #define CONFIGURE_INTERRUPT_STACK_MEMORY \
_Configure_From_workspace( CONFIGURE_INTERRUPT_STACK_SIZE )
#endif #endif
/** /**
@@ -809,10 +810,11 @@ rtems_fs_init_functions_t rtems_fs_init_helper =
#ifndef CONFIGURE_DISABLE_CLASSIC_NOTEPADS #ifndef CONFIGURE_DISABLE_CLASSIC_NOTEPADS
#define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \ #define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \
sizeof(RTEMS_API_Control) _Configure_From_workspace( sizeof(RTEMS_API_Control) )
#else #else
#define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \ #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 #endif
/** /**
@@ -921,14 +923,6 @@ rtems_fs_init_functions_t rtems_fs_init_helper =
#define CONFIGURE_TICKS_PER_TIMESLICE 50 #define CONFIGURE_TICKS_PER_TIMESLICE 50
#endif #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 * Initial Extension Set
*/ */
@@ -1486,10 +1480,12 @@ rtems_fs_init_functions_t rtems_fs_init_helper =
* solution. * solution.
*/ */
#if defined(__mips__) #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 #else
#define CONFIGURE_INTERRUPT_VECTOR_TABLE \ #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 #endif
#else #else
#define CONFIGURE_INTERRUPT_VECTOR_TABLE 0 #define CONFIGURE_INTERRUPT_VECTOR_TABLE 0
@@ -1592,9 +1588,10 @@ rtems_fs_init_functions_t rtems_fs_init_helper =
* user extensions. * user extensions.
*/ */
#define CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS \ #define CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS \
_Configure_From_workspace( \ ((CONFIGURE_NEWLIB_EXTENSION * \
(CONFIGURE_NEWLIB_EXTENSION + CONFIGURE_STACK_CHECKER_EXTENSION) * \ _Configure_From_workspace( sizeof(User_extensions_Control))) + \
sizeof(User_extensions_Control) \ (CONFIGURE_STACK_CHECKER_EXTENSION * \
_Configure_From_workspace( sizeof(User_extensions_Control))) \
) )
/** /**