[PATCH 13/15] score: Delete _Chain_Extract()

Sebastian Huber sebastian.huber at embedded-brains.de
Tue Apr 5 13:09:58 UTC 2016


This function is not used in the score.

Update #2555.
---
 cpukit/sapi/include/rtems/chain.h            |  9 -------
 cpukit/sapi/src/chainprotected.c             |  4 ++--
 cpukit/score/Makefile.am                     |  2 +-
 cpukit/score/include/rtems/score/chainimpl.h | 15 ------------
 cpukit/score/src/chainextract.c              | 36 ----------------------------
 5 files changed, 3 insertions(+), 63 deletions(-)
 delete mode 100644 cpukit/score/src/chainextract.c

diff --git a/cpukit/sapi/include/rtems/chain.h b/cpukit/sapi/include/rtems/chain.h
index 81f07b8..4bbdd53 100644
--- a/cpukit/sapi/include/rtems/chain.h
+++ b/cpukit/sapi/include/rtems/chain.h
@@ -560,18 +560,9 @@ RTEMS_INLINE_ROUTINE bool rtems_chain_is_tail(
  *
  * @arg the_node specifies the node to extract
  */
-#if defined( RTEMS_SMP )
 void rtems_chain_extract(
   rtems_chain_node *the_node
 );
-#else
-RTEMS_INLINE_ROUTINE void rtems_chain_extract(
-  rtems_chain_node *the_node
-)
-{
-  _Chain_Extract( the_node );
-}
-#endif
 
 /**
  * @brief Extract the specified node from a chain (unprotected).
diff --git a/cpukit/sapi/src/chainprotected.c b/cpukit/sapi/src/chainprotected.c
index df7a71c..e3ae7fd 100644
--- a/cpukit/sapi/src/chainprotected.c
+++ b/cpukit/sapi/src/chainprotected.c
@@ -31,8 +31,6 @@ static void chain_release( rtems_interrupt_lock_context *lock_context )
   rtems_interrupt_lock_release( &chain_lock, lock_context );
 }
 
-#if defined( RTEMS_SMP )
-
 void rtems_chain_extract( rtems_chain_node *node )
 {
   rtems_interrupt_lock_context lock_context;
@@ -42,6 +40,8 @@ void rtems_chain_extract( rtems_chain_node *node )
   chain_release( &lock_context );
 }
 
+#if defined( RTEMS_SMP )
+
 rtems_chain_node *rtems_chain_get( rtems_chain_control *chain )
 {
   rtems_chain_node *node;
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index e9d8cd9..6b4afdf 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -346,7 +346,7 @@ libscore_a_SOURCES += src/userextaddset.c \
 
 ## STD_C_FILES
 libscore_a_SOURCES += src/chain.c src/chainappend.c \
-    src/chainextract.c src/chainget.c \
+    src/chainget.c \
     src/chainnodecount.c \
     src/debugisthreaddispatchingallowed.c \
     src/interr.c src/isr.c src/wkspace.c src/wkstringduplicate.c
diff --git a/cpukit/score/include/rtems/score/chainimpl.h b/cpukit/score/include/rtems/score/chainimpl.h
index aee5307..40f9fd1 100644
--- a/cpukit/score/include/rtems/score/chainimpl.h
+++ b/cpukit/score/include/rtems/score/chainimpl.h
@@ -80,21 +80,6 @@ void _Chain_Initialize(
 );
 
 /**
- *  @brief Extract the specified node from a chain.
- *
- *  This routine extracts @a the_node from the chain on which it resides.
- *  It disables interrupts to ensure the atomicity of the extract operation.
- *
- *  @param[in] the_node is the node to be extracted
- *
- *  - INTERRUPT LATENCY:
- *    + single case
- */
-void _Chain_Extract(
-  Chain_Node *the_node
-);
-
-/**
  *  @brief Obtain the first node on a chain.
  *
  *  This function removes the first node from @a the_chain and returns
diff --git a/cpukit/score/src/chainextract.c b/cpukit/score/src/chainextract.c
deleted file mode 100644
index e83af72..0000000
--- a/cpukit/score/src/chainextract.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @file
- *
- * @brief Extracts a Node from a Chain
- *
- * @ingroup ScoreChain
- */
-
-/*
- *  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
-
-#include <rtems/system.h>
-#include <rtems/score/address.h>
-#include <rtems/score/chainimpl.h>
-#include <rtems/score/isr.h>
-
-void _Chain_Extract(
-  Chain_Node *node
-)
-{
-  ISR_Level level;
-
-  _ISR_Disable( level );
-    _Chain_Extract_unprotected( node );
-  _ISR_Enable( level );
-}
-- 
1.8.4.5




More information about the devel mailing list