This function is not used in the score. Update #2555. --- cpukit/sapi/include/rtems/chain.h | 10 ------ cpukit/sapi/src/chainprotected.c | 4 +++ cpukit/score/Makefile.am | 2 +- cpukit/score/include/rtems/score/chainimpl.h | 21 ----------- cpukit/score/src/chaininsert.c | 53 ---------------------------- 5 files changed, 5 insertions(+), 85 deletions(-) delete mode 100644 cpukit/score/src/chaininsert.c
diff --git a/cpukit/sapi/include/rtems/chain.h b/cpukit/sapi/include/rtems/chain.h index f776890..81f07b8 100644 --- a/cpukit/sapi/include/rtems/chain.h +++ b/cpukit/sapi/include/rtems/chain.h @@ -642,20 +642,10 @@ RTEMS_INLINE_ROUTINE rtems_chain_node *rtems_chain_get_first_unprotected( * NOTE: It disables interrupts to ensure the atomicity * of the extract operation. */ -#if defined( RTEMS_SMP ) void rtems_chain_insert( rtems_chain_node *after_node, rtems_chain_node *the_node ); -#else -RTEMS_INLINE_ROUTINE void rtems_chain_insert( - rtems_chain_node *after_node, - rtems_chain_node *the_node -) -{ - _Chain_Insert( after_node, the_node ); -} -#endif /** * @brief See _Chain_Insert_unprotected(). diff --git a/cpukit/sapi/src/chainprotected.c b/cpukit/sapi/src/chainprotected.c index 3d59348..df7a71c 100644 --- a/cpukit/sapi/src/chainprotected.c +++ b/cpukit/sapi/src/chainprotected.c @@ -54,6 +54,8 @@ rtems_chain_node *rtems_chain_get( rtems_chain_control *chain ) return node; } +#endif /* defined( RTEMS_SMP ) */ + void rtems_chain_insert( rtems_chain_node *after_node, rtems_chain_node *node ) { rtems_interrupt_lock_context lock_context; @@ -63,6 +65,8 @@ void rtems_chain_insert( rtems_chain_node *after_node, rtems_chain_node *node ) chain_release( &lock_context ); } +#if defined( RTEMS_SMP ) + void rtems_chain_append( rtems_chain_control *chain, rtems_chain_node *node diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index fa789d1..e9d8cd9 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/chaininsert.c \ + src/chainextract.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 fa9a046..aee5307 100644 --- a/cpukit/score/include/rtems/score/chainimpl.h +++ b/cpukit/score/include/rtems/score/chainimpl.h @@ -111,27 +111,6 @@ Chain_Node *_Chain_Get( ); /** - * @brief Insert a node on a chain. - * - * This routine inserts @a the_node on a chain immediately following - * @a after_node. - * - * @param[in] after_node is the pointer to the node in chain to be - * inserted after - * @param[in] the_node is the pointer to the node to be inserted - * - * @note It disables interrupts to ensure the atomicity - * of the insert operation. - * - * - INTERRUPT LATENCY: - * + single case - */ -void _Chain_Insert( - Chain_Node *after_node, - Chain_Node *the_node -); - -/** * @brief Append a node on the end of a chain. * * This routine appends @a the_node onto the end of @a the_chain. diff --git a/cpukit/score/src/chaininsert.c b/cpukit/score/src/chaininsert.c deleted file mode 100644 index 3a012ec..0000000 --- a/cpukit/score/src/chaininsert.c +++ /dev/null @@ -1,53 +0,0 @@ -/** - * @file - * - * @brief Extracts a node from a given 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> - -/* - * _Chain_Insert - * - * This kernel routine inserts a given node after a specified node - * a requested chain. - * - * Input parameters: - * after_node - pointer to node in chain to be inserted after - * node - pointer to node to be inserted - * - * Output parameters: NONE - * - * INTERRUPT LATENCY: - * only case - */ - -void _Chain_Insert( - Chain_Node *after_node, - Chain_Node *node -) -{ - ISR_Level level; - - _ISR_Disable( level ); - _Chain_Insert_unprotected( after_node, node ); - _ISR_Enable( level ); -} -- 1.8.4.5 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel