diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-07-03 20:25:35 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-07-03 20:25:35 +0000 |
commit | 27b961a39bbc5e23c33e185b72eefcd39c722e6d (patch) | |
tree | 92e604c103a8b41b7b8c65a0b373aedc2fd75cd7 | |
parent | 2009-07-03 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-27b961a39bbc5e23c33e185b72eefcd39c722e6d.tar.bz2 |
2009-07-03 Joel Sherrill <joel.sherrill@OARcorp.com>
* itron/src/task.c, posix/src/pthread.c, rtems/src/tasks.c,
sapi/src/exinit.c, score/include/rtems/score/apiext.h,
score/src/apiext.c: No APIs currently implemented use the
predriver_hook so disable it until such time as it is used.
Diffstat (limited to '')
-rw-r--r-- | cpukit/ChangeLog | 7 | ||||
-rw-r--r-- | cpukit/itron/src/task.c | 6 | ||||
-rw-r--r-- | cpukit/posix/src/pthread.c | 4 | ||||
-rw-r--r-- | cpukit/rtems/src/tasks.c | 4 | ||||
-rw-r--r-- | cpukit/sapi/src/exinit.c | 12 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/apiext.h | 42 | ||||
-rw-r--r-- | cpukit/score/src/apiext.c | 40 |
7 files changed, 68 insertions, 47 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index dcbc79c528..8afb00aeaf 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,12 @@ 2009-07-03 Joel Sherrill <joel.sherrill@OARcorp.com> + * itron/src/task.c, posix/src/pthread.c, rtems/src/tasks.c, + sapi/src/exinit.c, score/include/rtems/score/apiext.h, + score/src/apiext.c: No APIs currently implemented use the + predriver_hook so disable it until such time as it is used. + +2009-07-03 Joel Sherrill <joel.sherrill@OARcorp.com> + * posix/src/sigtimedwait.c: Restructure to improve coverage. Improve comments. diff --git a/cpukit/itron/src/task.c b/cpukit/itron/src/task.c index 180924eb3d..7c242676ce 100644 --- a/cpukit/itron/src/task.c +++ b/cpukit/itron/src/task.c @@ -112,8 +112,10 @@ void _ITRON_Task_Initialize_user_tasks( void ) API_extensions_Control _ITRON_Task_API_extensions = { { NULL, NULL }, - NULL, /* predriver */ - _ITRON_Task_Initialize_user_tasks, /* postdriver */ + #if defined(FUNCTIONALITY_NOT_CURRENTLY_USED_BY_ANY_API) + NULL, /* predriver */ + #endif + _ITRON_Task_Initialize_user_tasks, /* postdriver */ NULL /* post switch */ }; diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c index fad0845dd7..c9f93f7e25 100644 --- a/cpukit/posix/src/pthread.c +++ b/cpukit/posix/src/pthread.c @@ -289,7 +289,9 @@ void _POSIX_Threads_Initialize_user_threads( void ) API_extensions_Control _POSIX_Threads_API_extensions = { { NULL, NULL }, - NULL, /* predriver */ + #if defined(FUNCTIONALITY_NOT_CURRENTLY_USED_BY_ANY_API) + NULL, /* predriver */ + #endif _POSIX_Threads_Initialize_user_threads, /* postdriver */ _POSIX_signals_Post_switch_extension, /* post switch */ }; diff --git a/cpukit/rtems/src/tasks.c b/cpukit/rtems/src/tasks.c index 209e92b4e4..66c975cec8 100644 --- a/cpukit/rtems/src/tasks.c +++ b/cpukit/rtems/src/tasks.c @@ -215,7 +215,9 @@ void _RTEMS_tasks_Post_switch_extension( API_extensions_Control _RTEMS_tasks_API_extensions = { { NULL, NULL }, - NULL, /* predriver */ + #if defined(FUNCTIONALITY_NOT_CURRENTLY_USED_BY_ANY_API) + NULL, /* predriver */ + #endif _RTEMS_tasks_Initialize_user_tasks, /* postdriver */ _RTEMS_tasks_Post_switch_extension /* post switch */ }; diff --git a/cpukit/sapi/src/exinit.c b/cpukit/sapi/src/exinit.c index 41cf37e2ce..40cb02a6ad 100644 --- a/cpukit/sapi/src/exinit.c +++ b/cpukit/sapi/src/exinit.c @@ -179,12 +179,12 @@ void rtems_initialize_before_drivers(void) _MPCI_Create_server(); #endif - /* - * Run the API and BSPs predriver hook. - */ - - _API_extensions_Run_predriver(); - + #if defined(FUNCTIONALITY_NOT_CURRENTLY_USED_BY_ANY_API) + /* + * Run the API and BSPs predriver hook. + */ + _API_extensions_Run_predriver(); + #endif } void rtems_initialize_device_drivers(void) diff --git a/cpukit/score/include/rtems/score/apiext.h b/cpukit/score/include/rtems/score/apiext.h index e1135fbd63..c51bcc7b6e 100644 --- a/cpukit/score/include/rtems/score/apiext.h +++ b/cpukit/score/include/rtems/score/apiext.h @@ -5,7 +5,7 @@ */ /* - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -33,10 +33,12 @@ #include <rtems/score/chain.h> #include <rtems/score/thread.h> -/** - * This type defines the prototype of the Predriver Hook. - */ -typedef void (*API_extensions_Predriver_hook)(void); +#if defined(FUNCTIONALITY_NOT_CURRENTLY_USED_BY_ANY_API) + /** + * This type defines the prototype of the Predriver Hook. + */ + typedef void (*API_extensions_Predriver_hook)(void); +#endif /** * This type defines the prototype of the Postdriver Hook. @@ -57,14 +59,16 @@ typedef void (*API_extensions_Postswitch_hook)( typedef struct { /** This field allows this structure to be used with the Chain Handler. */ Chain_Node Node; - /** - * This field is the callout invoked during RTEMS initialization after - * RTEMS data structures are initialized before device driver initialization - * has occurred. - * - * @note If this field is NULL, no extension is invoked. - */ - API_extensions_Predriver_hook predriver_hook; + #if defined(FUNCTIONALITY_NOT_CURRENTLY_USED_BY_ANY_API) + /** + * This field is the callout invoked during RTEMS initialization after + * RTEMS data structures are initialized before device driver initialization + * has occurred. + * + * @note If this field is NULL, no extension is invoked. + */ + API_extensions_Predriver_hook predriver_hook; + #endif /** * This field is the callout invoked during RTEMS initialization after * RTEMS data structures and device driver initialization has occurred @@ -103,11 +107,13 @@ void _API_extensions_Add( API_extensions_Control *the_extension ); -/** @brief Execute all Pre-Driver Extensions - * - * This routine executes all of the predriver callouts. - */ -void _API_extensions_Run_predriver( void ); +#if defined(FUNCTIONALITY_NOT_CURRENTLY_USED_BY_ANY_API) + /** @brief Execute all Pre-Driver Extensions + * + * This routine executes all of the predriver callouts. + */ + void _API_extensions_Run_predriver( void ); +#endif /** @brief Execute all Post-Driver Extensions * diff --git a/cpukit/score/src/apiext.c b/cpukit/score/src/apiext.c index 5a2c5f52c7..98590bc817 100644 --- a/cpukit/score/src/apiext.c +++ b/cpukit/score/src/apiext.c @@ -41,26 +41,28 @@ void _API_extensions_Add( _Chain_Append( &_API_extensions_List, &the_extension->Node ); } -/*PAGE - * - * _API_extensions_Run_predriver - */ - -void _API_extensions_Run_predriver( void ) -{ - Chain_Node *the_node; - API_extensions_Control *the_extension; - - for ( the_node = _API_extensions_List.first ; - !_Chain_Is_tail( &_API_extensions_List, the_node ) ; - the_node = the_node->next ) { - - the_extension = (API_extensions_Control *) the_node; - - if ( the_extension->predriver_hook ) - (*the_extension->predriver_hook)(); +#if defined(FUNCTIONALITY_NOT_CURRENTLY_USED_BY_ANY_API) + /*PAGE + * + * _API_extensions_Run_predriver + */ + + void _API_extensions_Run_predriver( void ) + { + Chain_Node *the_node; + API_extensions_Control *the_extension; + + for ( the_node = _API_extensions_List.first ; + !_Chain_Is_tail( &_API_extensions_List, the_node ) ; + the_node = the_node->next ) { + + the_extension = (API_extensions_Control *) the_node; + + if ( the_extension->predriver_hook ) + (*the_extension->predriver_hook)(); + } } -} +#endif /*PAGE * |