diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-01-26 11:10:43 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-02-03 10:00:58 +0100 |
commit | 1ff8eca17a9f09bad3ab50c640547916808bf085 (patch) | |
tree | 4a9a1ae7d4edc0ebba0dc568d99cebad0bf1673e /cpukit | |
parent | Use linker set for MPCI initialization (diff) | |
download | rtems-1ff8eca17a9f09bad3ab50c640547916808bf085.tar.bz2 |
Use linker set for Classic User Tasks init
Update #2408.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/tasks.h | 9 | ||||
-rw-r--r-- | cpukit/rtems/src/tasks.c | 16 | ||||
-rw-r--r-- | cpukit/sapi/include/confdefs.h | 9 | ||||
-rw-r--r-- | cpukit/score/include/rtems/sysinit.h | 1 |
4 files changed, 6 insertions, 29 deletions
diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/cpukit/rtems/include/rtems/rtems/tasks.h index 45c01c4a4d..11e2780b9e 100644 --- a/cpukit/rtems/include/rtems/rtems/tasks.h +++ b/cpukit/rtems/include/rtems/rtems/tasks.h @@ -584,15 +584,6 @@ typedef struct { } RTEMS_API_Control; /** - * When the user configures a set of Classic API initialization tasks, - * This variable will point to the method used to initialize them. - * - * @note It is instantiated and initialized by confdefs.h based upon - * application requirements. - */ -extern void (*_RTEMS_tasks_Initialize_user_tasks_p)(void); - -/** * @brief _RTEMS_tasks_Initialize_user_tasks_body * * This routine creates and starts all configured user diff --git a/cpukit/rtems/src/tasks.c b/cpukit/rtems/src/tasks.c index 2a5c5da75e..832228e8aa 100644 --- a/cpukit/rtems/src/tasks.c +++ b/cpukit/rtems/src/tasks.c @@ -32,7 +32,6 @@ #include <rtems/score/threadimpl.h> #include <rtems/score/userextimpl.h> #include <rtems/score/wkspace.h> -#include <rtems/score/apiext.h> Thread_Information _RTEMS_tasks_Information; @@ -161,13 +160,6 @@ static void _RTEMS_tasks_Switch_extension( #define RTEMS_TASKS_SWITCH_EXTENSION NULL #endif -API_extensions_Control _RTEMS_tasks_API_extensions = { - #if defined(FUNCTIONALITY_NOT_CURRENTLY_USED_BY_ANY_API) - .predriver_hook = NULL, - #endif - .postdriver_hook = _RTEMS_tasks_Initialize_user_tasks -}; - User_extensions_Control _RTEMS_tasks_User_extensions = { { NULL, NULL }, { { NULL, NULL }, RTEMS_TASKS_SWITCH_EXTENSION }, @@ -205,8 +197,6 @@ static void _RTEMS_tasks_Manager_initialization(void) _User_extensions_Add_API_set( &_RTEMS_tasks_User_extensions ); - _API_extensions_Add( &_RTEMS_tasks_API_extensions ); - /* * Register the MP Process Packet routine. */ @@ -220,12 +210,6 @@ static void _RTEMS_tasks_Manager_initialization(void) } -void _RTEMS_tasks_Initialize_user_tasks( void ) -{ - if ( _RTEMS_tasks_Initialize_user_tasks_p ) - (*_RTEMS_tasks_Initialize_user_tasks_p)(); -} - RTEMS_SYSINIT_ITEM( _RTEMS_tasks_Manager_initialization, RTEMS_SYSINIT_CLASSIC_TASKS, diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index aa705e4c09..62db039185 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -3445,10 +3445,11 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; #ifdef CONFIGURE_INIT #if defined(CONFIGURE_RTEMS_INIT_TASKS_TABLE) || \ defined(CONFIGURE_HAS_OWN_INIT_TASK_TABLE) - void (*_RTEMS_tasks_Initialize_user_tasks_p)(void) = - _RTEMS_tasks_Initialize_user_tasks_body; - #else - void (*_RTEMS_tasks_Initialize_user_tasks_p)(void) = NULL; + RTEMS_SYSINIT_ITEM( + _RTEMS_tasks_Initialize_user_tasks_body, + RTEMS_SYSINIT_CLASSIC_USER_TASKS, + RTEMS_SYSINIT_ORDER_MIDDLE + ); #endif #endif diff --git a/cpukit/score/include/rtems/sysinit.h b/cpukit/score/include/rtems/sysinit.h index 37f001ae20..84eec29ead 100644 --- a/cpukit/score/include/rtems/sysinit.h +++ b/cpukit/score/include/rtems/sysinit.h @@ -69,6 +69,7 @@ extern "C" { #define RTEMS_SYSINIT_DRVMGR_LEVEL_3 000703 #define RTEMS_SYSINIT_DRVMGR_LEVEL_4 000704 #define RTEMS_SYSINIT_MP_FINALIZE 000705 +#define RTEMS_SYSINIT_CLASSIC_USER_TASKS 000706 #define RTEMS_SYSINIT_STD_FILE_DESCRIPTORS 000800 /* |