diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-12-14 15:27:56 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-02-03 10:00:54 +0100 |
commit | 97d94ff3e96c86d2a23b26efe48a9386c16a915a (patch) | |
tree | 8f20e518e51e91c77b07ba788fa87de4b914382e /cpukit | |
parent | Optional Classic Rate Monotonic initialization (diff) | |
download | rtems-97d94ff3e96c86d2a23b26efe48a9386c16a915a.tar.bz2 |
Optional Classic Barrier initialization
Update #2408.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/rtems/Makefile.am | 1 | ||||
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/barrierimpl.h | 23 | ||||
-rw-r--r-- | cpukit/rtems/src/barrier.c | 11 | ||||
-rw-r--r-- | cpukit/rtems/src/barrierdata.c | 26 | ||||
-rw-r--r-- | cpukit/sapi/src/rtemsapi.c | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/sysinit.h | 1 |
6 files changed, 12 insertions, 52 deletions
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index 7cf28b93a1..a295dafddc 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -141,7 +141,6 @@ librtems_a_SOURCES += src/barrierident.c librtems_a_SOURCES += src/barriertranslatereturncode.c librtems_a_SOURCES += src/barrierrelease.c librtems_a_SOURCES += src/barrierwait.c -librtems_a_SOURCES += src/barrierdata.c ## CLOCK_C_FILES librtems_a_SOURCES += src/clockget.c diff --git a/cpukit/rtems/include/rtems/rtems/barrierimpl.h b/cpukit/rtems/include/rtems/rtems/barrierimpl.h index e718028715..9b22a32d09 100644 --- a/cpukit/rtems/include/rtems/rtems/barrierimpl.h +++ b/cpukit/rtems/include/rtems/rtems/barrierimpl.h @@ -39,31 +39,10 @@ extern "C" { */ /** - * @brief Instantiate Barrier Data - * - * Barrier Manager -- Instantiate Data - * - * This constant is defined to extern most of the time when using - * this header file. However by defining it to nothing, the data - * declared in this header file can be instantiated. This is done - * in a single per manager file. - */ -#ifndef RTEMS_BARRIER_EXTERN -#define RTEMS_BARRIER_EXTERN extern -#endif - -/** * The following defines the information control block used to manage * this class of objects. */ -RTEMS_BARRIER_EXTERN Objects_Information _Barrier_Information; - -/** - * @brief _Barrier_Manager_initialization - * - * This routine performs the initialization necessary for this manager. - */ -void _Barrier_Manager_initialization(void); +extern Objects_Information _Barrier_Information; /** * @brief _Barrier_Allocate diff --git a/cpukit/rtems/src/barrier.c b/cpukit/rtems/src/barrier.c index e69332989c..6c85f4743e 100644 --- a/cpukit/rtems/src/barrier.c +++ b/cpukit/rtems/src/barrier.c @@ -20,14 +20,17 @@ #include <rtems/system.h> #include <rtems/config.h> +#include <rtems/sysinit.h> #include <rtems/rtems/status.h> #include <rtems/rtems/support.h> #include <rtems/rtems/barrierimpl.h> +Objects_Information _Barrier_Information; + /** * @brief _Barrier_Manager_initialization */ -void _Barrier_Manager_initialization(void) +static void _Barrier_Manager_initialization(void) { _Objects_Initialize_information( &_Barrier_Information, /* object information table */ @@ -45,3 +48,9 @@ void _Barrier_Manager_initialization(void) #endif ); } + +RTEMS_SYSINIT_ITEM( + _Barrier_Manager_initialization, + RTEMS_SYSINIT_CLASSIC_BARRIER, + RTEMS_SYSINIT_ORDER_MIDDLE +); diff --git a/cpukit/rtems/src/barrierdata.c b/cpukit/rtems/src/barrierdata.c deleted file mode 100644 index ea42919f48..0000000000 --- a/cpukit/rtems/src/barrierdata.c +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @file - * - * @brief Instantiate Barrier Data - * @ingroup ClassicBarrier Barriers - */ - -/* - * 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 barrier data */ -#define RTEMS_BARRIER_EXTERN - -#include <rtems/system.h> -#include <rtems/rtems/barrierimpl.h> - diff --git a/cpukit/sapi/src/rtemsapi.c b/cpukit/sapi/src/rtemsapi.c index 71f392bb04..0fddec67e9 100644 --- a/cpukit/sapi/src/rtemsapi.c +++ b/cpukit/sapi/src/rtemsapi.c @@ -26,10 +26,8 @@ #include <rtems/rtems/rtemsapi.h> #include <rtems/rtems/intr.h> -#include <rtems/rtems/barrierimpl.h> #include <rtems/rtems/clock.h> void _RTEMS_API_Initialize(void) { - _Barrier_Manager_initialization(); } diff --git a/cpukit/score/include/rtems/sysinit.h b/cpukit/score/include/rtems/sysinit.h index 35806407a1..faef223658 100644 --- a/cpukit/score/include/rtems/sysinit.h +++ b/cpukit/score/include/rtems/sysinit.h @@ -41,6 +41,7 @@ extern "C" { #define RTEMS_SYSINIT_CLASSIC_REGION 000347 #define RTEMS_SYSINIT_CLASSIC_DUAL_PORTED_MEMORY 000348 #define RTEMS_SYSINIT_CLASSIC_RATE_MONOTONIC 000349 +#define RTEMS_SYSINIT_CLASSIC_BARRIER 00034a #define RTEMS_SYSINIT_IDLE_THREADS 000380 #define RTEMS_SYSINIT_BSP_LIBC 000400 #define RTEMS_SYSINIT_BEFORE_DRIVERS 000500 |