diff options
| -rw-r--r-- | cpukit/Makefile.am | 1 | ||||
| -rw-r--r-- | cpukit/include/rtems/score/corebarrierimpl.h | 23 | ||||
| -rw-r--r-- | cpukit/score/src/corebarrierrelease.c | 37 | ||||
| -rw-r--r-- | spec/build/cpukit/librtemscpu.yml | 1 |
4 files changed, 6 insertions, 56 deletions
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 14abc8bb6a..a31cd31596 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -833,7 +833,6 @@ librtemscpu_a_SOURCES += score/src/apimutexisowner.c librtemscpu_a_SOURCES += score/src/apimutexlock.c librtemscpu_a_SOURCES += score/src/apimutexunlock.c librtemscpu_a_SOURCES += score/src/corebarrier.c -librtemscpu_a_SOURCES += score/src/corebarrierrelease.c librtemscpu_a_SOURCES += score/src/corebarrierwait.c librtemscpu_a_SOURCES += score/src/coremsg.c librtemscpu_a_SOURCES += score/src/coremsgbroadcast.c diff --git a/cpukit/include/rtems/score/corebarrierimpl.h b/cpukit/include/rtems/score/corebarrierimpl.h index 86a3e956dc..4e7f07d8e9 100644 --- a/cpukit/include/rtems/score/corebarrierimpl.h +++ b/cpukit/include/rtems/score/corebarrierimpl.h @@ -128,19 +128,6 @@ Status_Control _CORE_barrier_Seize( ); /** - * @brief Flushes the barrier. - * - * @param[in, out] the_barrier The barrier to flush. - * @param[out] filter The filter for flushing. - * @param[out] queue_context The thread queue context. - */ -uint32_t _CORE_barrier_Do_flush( - CORE_barrier_Control *the_barrier, - Thread_queue_Flush_filter filter, - Thread_queue_Context *queue_context -); - -/** * @brief Manually releases the barrier. * * This routine manually releases the barrier. All of the threads waiting @@ -156,8 +143,9 @@ RTEMS_INLINE_ROUTINE uint32_t _CORE_barrier_Surrender( Thread_queue_Context *queue_context ) { - return _CORE_barrier_Do_flush( - the_barrier, + return _Thread_queue_Flush_critical( + &the_barrier->Wait_queue.Queue, + &_CORE_barrier_Thread_queue_operations, _Thread_queue_Flush_default_filter, queue_context ); @@ -174,8 +162,9 @@ RTEMS_INLINE_ROUTINE void _CORE_barrier_Flush( Thread_queue_Context *queue_context ) { - _CORE_barrier_Do_flush( - the_barrier, + _Thread_queue_Flush_critical( + &the_barrier->Wait_queue.Queue, + &_CORE_barrier_Thread_queue_operations, _Thread_queue_Flush_status_object_was_deleted, queue_context ); diff --git a/cpukit/score/src/corebarrierrelease.c b/cpukit/score/src/corebarrierrelease.c deleted file mode 100644 index 3202171e7f..0000000000 --- a/cpukit/score/src/corebarrierrelease.c +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file - * - * @ingroup RTEMSScoreBarrier - * - * @brief This source file contains the implementation of - * _CORE_barrier_Do_flush(). - */ - -/* - * COPYRIGHT (c) 1989-2006. - * 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. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <rtems/score/corebarrierimpl.h> - -uint32_t _CORE_barrier_Do_flush( - CORE_barrier_Control *the_barrier, - Thread_queue_Flush_filter filter, - Thread_queue_Context *queue_context -) -{ - return _Thread_queue_Flush_critical( - &the_barrier->Wait_queue.Queue, - &_CORE_barrier_Thread_queue_operations, - filter, - queue_context - ); -} diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml index 3d1ec086b6..dcdd62a108 100644 --- a/spec/build/cpukit/librtemscpu.yml +++ b/spec/build/cpukit/librtemscpu.yml @@ -1371,7 +1371,6 @@ source: - cpukit/score/src/condition.c - cpukit/score/src/configstackspacesize.c - cpukit/score/src/corebarrier.c -- cpukit/score/src/corebarrierrelease.c - cpukit/score/src/corebarrierwait.c - cpukit/score/src/coremsgbroadcast.c - cpukit/score/src/coremsg.c |