RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score/rbtree: replace _RBTree_Peek_unprotected with _RBTree_First.

Browse Source
This commit is contained in:
Gedare Bloom
2012-05-02 11:13:22 -04:00
parent bc96bad6ca
commit 8712622959
2 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cpukit/score/inline/rtems/score/rbtree.inl
View File

@@ -10,13 +10,11 @@
*/
/*
* Copyright (c) 2010 Gedare Bloom.
* Copyright (c) 2010-2012 Gedare Bloom.
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
*
* $Id$
*/
#ifndef _RTEMS_SCORE_RBTREE_H
@@ -459,22 +457,6 @@ RTEMS_INLINE_ROUTINE RBTree_Node *_RBTree_Get_unprotected(
return the_node;
}
/** @brief Peek at the First Node (unprotected)
*
* This function returns a pointer to the first node, minimum if @a dir is 0
* or maximum if @a dir is 1, from @a the_rbtree without extracting it.
* It does NOT disable interrupts to ensure the atomicity of the peek.
*
* @retval NULL if @a the_rbtree is empty.
*/
RTEMS_INLINE_ROUTINE RBTree_Node *_RBTree_Peek_unprotected(
const RBTree_Control *the_rbtree,
RBTree_Direction dir
)
{
return(the_rbtree->first[dir]);
}
/** @brief Rotate the_node in the direction passed as second argument
*
* This routine rotates @a the_node to the direction @a dir, swapping

6
cpukit/score/src/rbtreepeek.c
View File

@@ -1,11 +1,9 @@
/*
* Copyright (c) 2010 Gedare Bloom.
* Copyright (c) 2010-2012 Gedare Bloom.
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
*
* $Id$
*/
#if HAVE_CONFIG_H
@@ -45,7 +43,7 @@ RBTree_Node *_RBTree_Peek(
return_node = NULL;
_ISR_Disable( level );
return_node = _RBTree_Peek_unprotected( the_rbtree, dir );
return_node = _RBTree_First( the_rbtree, dir );
_ISR_Enable( level );
return return_node;
}