diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-12-10 11:40:26 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-02-03 10:00:51 +0100 |
commit | 92bb345374ea3982b40b10e7d50ecfc1cb4d2ed3 (patch) | |
tree | ec676c079a13b699e7dd28933b26c2a533410e9a /cpukit/sapi/src | |
parent | Optional Initial Extensions initialization (diff) | |
download | rtems-92bb345374ea3982b40b10e7d50ecfc1cb4d2ed3.tar.bz2 |
Optional Extensions initialization
Update #2408.
Diffstat (limited to 'cpukit/sapi/src')
-rw-r--r-- | cpukit/sapi/src/exinit.c | 2 | ||||
-rw-r--r-- | cpukit/sapi/src/extension.c | 16 | ||||
-rw-r--r-- | cpukit/sapi/src/extensiondata.c | 25 |
3 files changed, 11 insertions, 32 deletions
diff --git a/cpukit/sapi/src/exinit.c b/cpukit/sapi/src/exinit.c index 685197df90..4b04b5f252 100644 --- a/cpukit/sapi/src/exinit.c +++ b/cpukit/sapi/src/exinit.c @@ -137,8 +137,6 @@ static void rtems_initialize_data_structures(void) _RTEMS_API_Initialize(); - _Extension_Manager_initialization(); - _POSIX_API_Initialize(); } diff --git a/cpukit/sapi/src/extension.c b/cpukit/sapi/src/extension.c index 100f194851..337885070f 100644 --- a/cpukit/sapi/src/extension.c +++ b/cpukit/sapi/src/extension.c @@ -21,13 +21,13 @@ #include "config.h" #endif -#include <rtems/system.h> -#include <rtems/config.h> -#include <rtems/rtems/support.h> -#include <rtems/score/thread.h> #include <rtems/extensionimpl.h> +#include <rtems/config.h> +#include <rtems/sysinit.h> -void _Extension_Manager_initialization(void) +Objects_Information _Extension_Information; + +static void _Extension_Manager_initialization(void) { _Objects_Initialize_information( &_Extension_Information, @@ -44,3 +44,9 @@ void _Extension_Manager_initialization(void) #endif ); } + +RTEMS_SYSINIT_ITEM( + _Extension_Manager_initialization, + RTEMS_SYSINIT_USER_EXTENSIONS, + RTEMS_SYSINIT_ORDER_MIDDLE +); diff --git a/cpukit/sapi/src/extensiondata.c b/cpukit/sapi/src/extensiondata.c deleted file mode 100644 index 0d7e481948..0000000000 --- a/cpukit/sapi/src/extensiondata.c +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file - * - * @brief Extension Data - * - * @ingroup ClassicUserExtensions - */ - -/* - * COPYRIGHT (c) 1989-2007. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -/* instantiate extension data */ -#define SAPI_EXT_EXTERN - -#include <rtems/extensionimpl.h> |