diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-12-14 16:37:34 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-02-03 10:00:56 +0100 |
| commit | e4e7f149c0f4d167a40862fee90707d38ee1aaf6 (patch) | |
| tree | 9e9093371d64e279404c6a56fc9e66c82cb09b6c /cpukit | |
| parent | Optional POSIX Timer initialization (diff) | |
| download | rtems-e4e7f149c0f4d167a40862fee90707d38ee1aaf6.tar.bz2 | |
Optional POSIX Barrier initialization
Update #2408.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/posix/include/rtems/posix/barrierimpl.h | 10 | ||||
| -rw-r--r-- | cpukit/posix/src/pbarrier.c | 11 | ||||
| -rw-r--r-- | cpukit/sapi/src/posixapi.c | 2 | ||||
| -rw-r--r-- | cpukit/score/include/rtems/sysinit.h | 1 |
4 files changed, 12 insertions, 12 deletions
diff --git a/cpukit/posix/include/rtems/posix/barrierimpl.h b/cpukit/posix/include/rtems/posix/barrierimpl.h index 22be1c0d6e..646b734da2 100644 --- a/cpukit/posix/include/rtems/posix/barrierimpl.h +++ b/cpukit/posix/include/rtems/posix/barrierimpl.h @@ -34,15 +34,7 @@ extern "C" { * this class of objects. */ -POSIX_EXTERN Objects_Information _POSIX_Barrier_Information; - -/** - * @brief POSIX barrier manager initialization. - * - * This routine performs the initialization necessary for this manager. - */ - -void _POSIX_Barrier_Manager_initialization(void); +extern Objects_Information _POSIX_Barrier_Information; /** * @brief POSIX translate barrier return code. diff --git a/cpukit/posix/src/pbarrier.c b/cpukit/posix/src/pbarrier.c index 5f32fcbc1d..1ae3115f80 100644 --- a/cpukit/posix/src/pbarrier.c +++ b/cpukit/posix/src/pbarrier.c @@ -21,12 +21,15 @@ #include <rtems/system.h> #include <rtems/config.h> +#include <rtems/sysinit.h> #include <rtems/posix/barrierimpl.h> +Objects_Information _POSIX_Barrier_Information; + /** * @brief _POSIX_Barrier_Manager_initialization */ -void _POSIX_Barrier_Manager_initialization(void) +static void _POSIX_Barrier_Manager_initialization(void) { _Objects_Initialize_information( &_POSIX_Barrier_Information, /* object information table */ @@ -44,3 +47,9 @@ void _POSIX_Barrier_Manager_initialization(void) #endif ); } + +RTEMS_SYSINIT_ITEM( + _POSIX_Barrier_Manager_initialization, + RTEMS_SYSINIT_POSIX_BARRIER, + RTEMS_SYSINIT_ORDER_MIDDLE +); diff --git a/cpukit/sapi/src/posixapi.c b/cpukit/sapi/src/posixapi.c index f6459461b7..5c6b0772bd 100644 --- a/cpukit/sapi/src/posixapi.c +++ b/cpukit/sapi/src/posixapi.c @@ -31,7 +31,6 @@ #include <sys/types.h> #include <mqueue.h> #include <rtems/config.h> -#include <rtems/posix/barrierimpl.h> #include <rtems/posix/config.h> #include <rtems/posix/priorityimpl.h> #include <rtems/posix/psignalimpl.h> @@ -58,7 +57,6 @@ void _POSIX_API_Initialize(void) _POSIX_Key_Manager_initialization(); #ifdef RTEMS_POSIX_API - _POSIX_Barrier_Manager_initialization(); _POSIX_RWLock_Manager_initialization(); _POSIX_Spinlock_Manager_initialization(); #endif diff --git a/cpukit/score/include/rtems/sysinit.h b/cpukit/score/include/rtems/sysinit.h index 95865c460f..27c193a78f 100644 --- a/cpukit/score/include/rtems/sysinit.h +++ b/cpukit/score/include/rtems/sysinit.h @@ -49,6 +49,7 @@ extern "C" { #define RTEMS_SYSINIT_POSIX_MESSAGE_QUEUE 000364 #define RTEMS_SYSINIT_POSIX_SEMAPHORE 000365 #define RTEMS_SYSINIT_POSIX_TIMER 000366 +#define RTEMS_SYSINIT_POSIX_BARRIER 000367 #define RTEMS_SYSINIT_POSIX_CLEANUP 00036a #define RTEMS_SYSINIT_IDLE_THREADS 000380 #define RTEMS_SYSINIT_BSP_LIBC 000400 |