summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2015-05-02 14:04:21 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2015-05-19 12:00:47 +0200
commitb76dd97990844ad0a0ff6cefadd433b681805a35 (patch)
tree856307e46bb7eef1199ed9c69308b723b6e1758d
parentscore: Delete _CORE_semaphore_Seize() (diff)
downloadrtems-b76dd97990844ad0a0ff6cefadd433b681805a35.tar.bz2
score: Inline _CORE_semaphore_Flush()
-rw-r--r--cpukit/score/Makefile.am2
-rw-r--r--cpukit/score/include/rtems/score/coresemimpl.h11
-rw-r--r--cpukit/score/src/coresemflush.c39
3 files changed, 10 insertions, 42 deletions
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index d8ec8e113b..58673bb188 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -177,7 +177,7 @@ libscore_a_SOURCES += src/corerwlock.c src/corerwlockobtainread.c \
endif
## CORE_SEMAPHORE_C_FILES
-libscore_a_SOURCES += src/coresem.c src/coresemflush.c \
+libscore_a_SOURCES += src/coresem.c \
src/coresemsurrender.c
## CORE_SPINLOCK_C_FILES
diff --git a/cpukit/score/include/rtems/score/coresemimpl.h b/cpukit/score/include/rtems/score/coresemimpl.h
index 7e967ed488..dcea1a3737 100644
--- a/cpukit/score/include/rtems/score/coresemimpl.h
+++ b/cpukit/score/include/rtems/score/coresemimpl.h
@@ -140,11 +140,18 @@ CORE_semaphore_Status _CORE_semaphore_Surrender(
* thread unblocked is remote
* @param[in] status is the status to be returned to the unblocked thread
*/
-void _CORE_semaphore_Flush(
+RTEMS_INLINE_ROUTINE void _CORE_semaphore_Flush(
CORE_semaphore_Control *the_semaphore,
Thread_queue_Flush_callout remote_extract_callout,
uint32_t status
-);
+)
+{
+ _Thread_queue_Flush(
+ &the_semaphore->Wait_queue,
+ remote_extract_callout,
+ status
+ );
+}
/**
* This function returns true if the priority attribute is
diff --git a/cpukit/score/src/coresemflush.c b/cpukit/score/src/coresemflush.c
deleted file mode 100644
index 1db0db926b..0000000000
--- a/cpukit/score/src/coresemflush.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @file
- *
- * @brief Core Semaphore Flush
- * @ingroup ScoreSemaphore
- */
-
-/*
- * COPYRIGHT (c) 1989-1999.
- * 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
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/coresemimpl.h>
-#include <rtems/score/thread.h>
-
-void _CORE_semaphore_Flush(
- CORE_semaphore_Control *the_semaphore,
- Thread_queue_Flush_callout remote_extract_callout,
- uint32_t status
-)
-{
-
- _Thread_queue_Flush(
- &the_semaphore->Wait_queue,
- remote_extract_callout,
- status
- );
-
-}