From 4bae341dc94c57a812427194c7f49f37bd006bb3 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 20 May 2016 15:01:46 +0200 Subject: score: Delete unused _Objects_Get_isr_disable() Delete now unused Objects_Locations. --- cpukit/score/Makefile.am | 2 +- cpukit/score/include/rtems/score/objectimpl.h | 42 -------------------- cpukit/score/src/objectgetisr.c | 55 --------------------------- 3 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 cpukit/score/src/objectgetisr.c diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 7ca63417db..a3f3dfc92d 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -211,7 +211,7 @@ libscore_a_SOURCES += src/heap.c src/heapallocate.c src/heapextend.c \ ## OBJECT_C_FILES libscore_a_SOURCES += src/objectallocate.c src/objectclose.c \ src/objectextendinformation.c src/objectfree.c \ - src/objectgetisr.c src/objectgetnext.c src/objectinitializeinformation.c \ + src/objectgetnext.c src/objectinitializeinformation.c \ src/objectnametoid.c src/objectnametoidstring.c \ src/objectshrinkinformation.c src/objectgetnoprotection.c \ src/objectidtoname.c src/objectgetnameasstring.c src/objectsetname.c \ diff --git a/cpukit/score/include/rtems/score/objectimpl.h b/cpukit/score/include/rtems/score/objectimpl.h index 52b6ab31bc..766080effb 100644 --- a/cpukit/score/include/rtems/score/objectimpl.h +++ b/cpukit/score/include/rtems/score/objectimpl.h @@ -108,19 +108,6 @@ typedef enum { OBJECTS_FAKE_OBJECTS_SCHEDULERS = 1 } Objects_Fake_objects_API; -/** - * This enumerated type lists the locations which may be returned - * by _Objects_Get_isr_disable. These codes indicate the success of locating - * an object with the specified ID. - */ -typedef enum { -#if defined(RTEMS_MULTIPROCESSING) - OBJECTS_REMOTE = 2, /* object is remote */ -#endif - OBJECTS_LOCAL = 0, /* object is local */ - OBJECTS_ERROR = 1 /* id was invalid */ -} Objects_Locations; - #if defined(RTEMS_MULTIPROCESSING) /** * The following type defines the callout used when a local task @@ -542,35 +529,6 @@ Objects_Name_or_id_lookup_errors _Objects_Id_to_name ( Objects_Name *name ); -/** - * @brief Maps object ids to object control blocks. - * - * This function maps object ids to object control blocks. - * If id corresponds to a local object, then it returns - * the_object control pointer which maps to id and location - * is set to OBJECTS_LOCAL. If the object class supports global - * objects and the object id is global and resides on a remote - * node, then location is set to OBJECTS_REMOTE, and the_object - * is undefined. Otherwise, location is set to OBJECTS_ERROR - * and the_object is undefined. - * - * @param[in] information points to an object class information block. - * @param[in] id is the Id of the object whose name we are locating. - * @param[in] location will contain an indication of success or failure. - * @param[in] lock_context is the previous interrupt state being turned. - * - * @retval This method returns one of the values from the - * @ref Objects_Name_or_id_lookup_errors enumeration to indicate - * successful or failure. On success @a name will contain the name of - * the requested object. - */ -Objects_Control *_Objects_Get_isr_disable( - Objects_Information *information, - Objects_Id id, - Objects_Locations *location, - ISR_lock_Context *lock_context -); - /** * @brief Maps the specified object identifier to the associated local object * control block. diff --git a/cpukit/score/src/objectgetisr.c b/cpukit/score/src/objectgetisr.c deleted file mode 100644 index 71f62fe482..0000000000 --- a/cpukit/score/src/objectgetisr.c +++ /dev/null @@ -1,55 +0,0 @@ -/** - * @file - * - * @brief Object Get Isr Disable - * @ingroup ScoreObject - */ - -/* - * 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 - -Objects_Control *_Objects_Get_isr_disable( - Objects_Information *information, - Objects_Id id, - Objects_Locations *location, - ISR_lock_Context *lock_context -) -{ - Objects_Control *the_object; - uint32_t index; - - index = id - information->minimum_id + 1; - - if ( information->maximum >= index ) { - _ISR_lock_ISR_disable( lock_context ); - if ( (the_object = information->local_table[ index ]) != NULL ) { - *location = OBJECTS_LOCAL; - return the_object; - } - _ISR_lock_ISR_enable( lock_context ); - *location = OBJECTS_ERROR; - return NULL; - } - - *location = OBJECTS_ERROR; - -#if defined(RTEMS_MULTIPROCESSING) - if ( _Objects_MP_Is_remote( id, information ) ) { - *location = OBJECTS_REMOTE; - } -#endif - - return NULL; -} -- cgit v1.2.3