From bd91f446f2a9d19d8cbd0eb9a21816e15111bbed Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 8 Dec 2015 08:34:08 +0100 Subject: score: Delete unused API extensions Update #2408. --- cpukit/sapi/src/exinit.c | 7 ------- cpukit/score/include/rtems/score/apiext.h | 28 +--------------------------- cpukit/score/src/apiext.c | 24 +----------------------- 3 files changed, 2 insertions(+), 57 deletions(-) diff --git a/cpukit/sapi/src/exinit.c b/cpukit/sapi/src/exinit.c index b29d8c00fb..794ccb4bfa 100644 --- a/cpukit/sapi/src/exinit.c +++ b/cpukit/sapi/src/exinit.c @@ -164,13 +164,6 @@ void rtems_initialize_before_drivers(void) #if defined(RTEMS_MULTIPROCESSING) _MPCI_Create_server(); #endif - - #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 7b77ab5d5b..ab1329b261 100644 --- a/cpukit/score/include/rtems/score/apiext.h +++ b/cpukit/score/include/rtems/score/apiext.h @@ -19,7 +19,6 @@ #define _RTEMS_SCORE_APIEXT_H #include -#include #ifdef __cplusplus extern "C" { @@ -39,13 +38,6 @@ extern "C" { */ /**@{*/ -#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. */ @@ -58,16 +50,7 @@ typedef void (*API_extensions_Postdriver_hook)(void); typedef struct { /** This field allows this structure to be used with the Chain Handler. */ Chain_Node Node; - #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 @@ -89,15 +72,6 @@ void _API_extensions_Add( API_extensions_Control *the_extension ); -#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 8deb90b9fd..c91590bd13 100644 --- a/cpukit/score/src/apiext.c +++ b/cpukit/score/src/apiext.c @@ -30,25 +30,6 @@ void _API_extensions_Add( _Chain_Append( &_API_extensions_List, &the_extension->Node ); } -#if defined(FUNCTIONALITY_NOT_CURRENTLY_USED_BY_ANY_API) - - void _API_extensions_Run_predriver( void ) - { - Chain_Node *the_node; - API_extensions_Control *the_extension; - - for ( the_node = _Chain_First( &_API_extensions_List ); - !_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 - void _API_extensions_Run_postdriver( void ) { Chain_Node *the_node; @@ -63,9 +44,6 @@ void _API_extensions_Run_postdriver( void ) /* * Currently all APIs configure this hook so it is always non-NULL. */ -#if defined(FUNCTIONALITY_NOT_CURRENTLY_USED_BY_ANY_API) - if ( the_extension->postdriver_hook ) -#endif - (*the_extension->postdriver_hook)(); + (*the_extension->postdriver_hook)(); } } -- cgit v1.2.3