From 582bb23c74b0617c60d7986afa756c90c28df739 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 20 May 2016 15:04:16 +0200 Subject: score: Rename _Objects_Get_local() Rename _Objects_Get_local() into _Objects_Get(). Confusions with the previous _Objects_Get() function are avoided since the Objects_Locations parameter is gone. --- cpukit/posix/include/rtems/posix/barrierimpl.h | 2 +- cpukit/posix/include/rtems/posix/mqueueimpl.h | 2 +- cpukit/posix/include/rtems/posix/posixapi.h | 4 ++-- cpukit/posix/include/rtems/posix/semaphoreimpl.h | 2 +- cpukit/posix/include/rtems/posix/spinlockimpl.h | 2 +- cpukit/posix/include/rtems/posix/timerimpl.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'cpukit/posix/include') diff --git a/cpukit/posix/include/rtems/posix/barrierimpl.h b/cpukit/posix/include/rtems/posix/barrierimpl.h index f4c350ed95..5173531f37 100644 --- a/cpukit/posix/include/rtems/posix/barrierimpl.h +++ b/cpukit/posix/include/rtems/posix/barrierimpl.h @@ -82,7 +82,7 @@ RTEMS_INLINE_ROUTINE POSIX_Barrier_Control *_POSIX_Barrier_Get ( ISR_lock_Context *lock_context ) { - return (POSIX_Barrier_Control *) _Objects_Get_local( + return (POSIX_Barrier_Control *) _Objects_Get( (Objects_Id) *barrier, lock_context, &_POSIX_Barrier_Information diff --git a/cpukit/posix/include/rtems/posix/mqueueimpl.h b/cpukit/posix/include/rtems/posix/mqueueimpl.h index 9d13226f3e..3185970035 100644 --- a/cpukit/posix/include/rtems/posix/mqueueimpl.h +++ b/cpukit/posix/include/rtems/posix/mqueueimpl.h @@ -112,7 +112,7 @@ RTEMS_INLINE_ROUTINE POSIX_Message_queue_Control *_POSIX_Message_queue_Get( ) { return (POSIX_Message_queue_Control *) - _Objects_Get_local( id, lock_context, &_POSIX_Message_queue_Information ); + _Objects_Get( id, lock_context, &_POSIX_Message_queue_Information ); } /* diff --git a/cpukit/posix/include/rtems/posix/posixapi.h b/cpukit/posix/include/rtems/posix/posixapi.h index f2378c184a..a16b6ad54b 100644 --- a/cpukit/posix/include/rtems/posix/posixapi.h +++ b/cpukit/posix/include/rtems/posix/posixapi.h @@ -80,14 +80,14 @@ RTEMS_INLINE_ROUTINE int _POSIX_Get_by_name_error( if ( id == NULL ) { \ return NULL; \ } \ - the_object = _Objects_Get_local( (Objects_Id) *id, lock_context, info ); \ + the_object = _Objects_Get( (Objects_Id) *id, lock_context, info ); \ if ( the_object == NULL ) { \ _Once_Lock(); \ if ( *id == initializer ) { \ init( id, NULL ); \ } \ _Once_Unlock(); \ - the_object = _Objects_Get_local( (Objects_Id) *id, lock_context, info ); \ + the_object = _Objects_Get( (Objects_Id) *id, lock_context, info ); \ } \ return (type *) the_object diff --git a/cpukit/posix/include/rtems/posix/semaphoreimpl.h b/cpukit/posix/include/rtems/posix/semaphoreimpl.h index a4090441c6..402329a882 100644 --- a/cpukit/posix/include/rtems/posix/semaphoreimpl.h +++ b/cpukit/posix/include/rtems/posix/semaphoreimpl.h @@ -65,7 +65,7 @@ RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Get( ISR_lock_Context *lock_context ) { - return (POSIX_Semaphore_Control *) _Objects_Get_local( + return (POSIX_Semaphore_Control *) _Objects_Get( (Objects_Id) *id, lock_context, &_POSIX_Semaphore_Information diff --git a/cpukit/posix/include/rtems/posix/spinlockimpl.h b/cpukit/posix/include/rtems/posix/spinlockimpl.h index 80de3d1001..e0217a0889 100644 --- a/cpukit/posix/include/rtems/posix/spinlockimpl.h +++ b/cpukit/posix/include/rtems/posix/spinlockimpl.h @@ -84,7 +84,7 @@ RTEMS_INLINE_ROUTINE POSIX_Spinlock_Control *_POSIX_Spinlock_Get( return NULL; } - return (POSIX_Spinlock_Control *) _Objects_Get_local( + return (POSIX_Spinlock_Control *) _Objects_Get( *spinlock, lock_context, &_POSIX_Spinlock_Information diff --git a/cpukit/posix/include/rtems/posix/timerimpl.h b/cpukit/posix/include/rtems/posix/timerimpl.h index 5a6cf28631..42a814c992 100644 --- a/cpukit/posix/include/rtems/posix/timerimpl.h +++ b/cpukit/posix/include/rtems/posix/timerimpl.h @@ -97,7 +97,7 @@ RTEMS_INLINE_ROUTINE POSIX_Timer_Control *_POSIX_Timer_Get ( ISR_lock_Context *lock_context ) { - return (POSIX_Timer_Control *) _Objects_Get_local( + return (POSIX_Timer_Control *) _Objects_Get( (Objects_Id) id, lock_context, &_POSIX_Timer_Information -- cgit v1.2.3