[rtems commit] score: Rename _Objects_Get_local()
Sebastian Huber
sebh at rtems.org
Fri May 20 14:19:14 UTC 2016
Module: rtems
Branch: master
Commit: 582bb23c74b0617c60d7986afa756c90c28df739
Changeset: http://git.rtems.org/rtems/commit/?id=582bb23c74b0617c60d7986afa756c90c28df739
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Fri May 20 15:04:16 2016 +0200
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 +-
cpukit/rtems/include/rtems/rtems/barrierimpl.h | 2 +-
cpukit/rtems/include/rtems/rtems/dpmemimpl.h | 2 +-
cpukit/rtems/include/rtems/rtems/messageimpl.h | 2 +-
cpukit/rtems/include/rtems/rtems/partimpl.h | 2 +-
cpukit/rtems/include/rtems/rtems/ratemonimpl.h | 2 +-
cpukit/rtems/include/rtems/rtems/semimpl.h | 2 +-
cpukit/rtems/include/rtems/rtems/timerimpl.h | 2 +-
cpukit/score/include/rtems/score/objectimpl.h | 2 +-
cpukit/score/include/rtems/score/threadimpl.h | 2 +-
cpukit/score/src/objectgetlocal.c | 2 +-
cpukit/score/src/objectgetnameasstring.c | 2 +-
cpukit/score/src/objectidtoname.c | 2 +-
cpukit/score/src/threadget.c | 2 +-
19 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/cpukit/posix/include/rtems/posix/barrierimpl.h b/cpukit/posix/include/rtems/posix/barrierimpl.h
index f4c350e..5173531 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 9d13226..3185970 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 f2378c1..a16b6ad 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 a409044..402329a 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 80de3d1..e0217a0 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 5a6cf28..42a814c 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
diff --git a/cpukit/rtems/include/rtems/rtems/barrierimpl.h b/cpukit/rtems/include/rtems/rtems/barrierimpl.h
index 99ce276..39632fc 100644
--- a/cpukit/rtems/include/rtems/rtems/barrierimpl.h
+++ b/cpukit/rtems/include/rtems/rtems/barrierimpl.h
@@ -75,7 +75,7 @@ RTEMS_INLINE_ROUTINE Barrier_Control *_Barrier_Get(
)
{
return (Barrier_Control *)
- _Objects_Get_local( id, lock_context, &_Barrier_Information );
+ _Objects_Get( id, lock_context, &_Barrier_Information );
}
/**
diff --git a/cpukit/rtems/include/rtems/rtems/dpmemimpl.h b/cpukit/rtems/include/rtems/rtems/dpmemimpl.h
index df51378..52ac48c 100644
--- a/cpukit/rtems/include/rtems/rtems/dpmemimpl.h
+++ b/cpukit/rtems/include/rtems/rtems/dpmemimpl.h
@@ -72,7 +72,7 @@ RTEMS_INLINE_ROUTINE Dual_ported_memory_Control *_Dual_ported_memory_Get(
)
{
return (Dual_ported_memory_Control *)
- _Objects_Get_local( id, lock_context, &_Dual_ported_memory_Information );
+ _Objects_Get( id, lock_context, &_Dual_ported_memory_Information );
}
/**@}*/
diff --git a/cpukit/rtems/include/rtems/rtems/messageimpl.h b/cpukit/rtems/include/rtems/rtems/messageimpl.h
index a40ace3..5a12b85 100644
--- a/cpukit/rtems/include/rtems/rtems/messageimpl.h
+++ b/cpukit/rtems/include/rtems/rtems/messageimpl.h
@@ -107,7 +107,7 @@ _Message_queue_Get_interrupt_disable(
ISR_lock_Context *lock_context
)
{
- return (Message_queue_Control *) _Objects_Get_local(
+ return (Message_queue_Control *) _Objects_Get(
id,
lock_context,
&_Message_queue_Information
diff --git a/cpukit/rtems/include/rtems/rtems/partimpl.h b/cpukit/rtems/include/rtems/rtems/partimpl.h
index ea79155..13ee86b 100644
--- a/cpukit/rtems/include/rtems/rtems/partimpl.h
+++ b/cpukit/rtems/include/rtems/rtems/partimpl.h
@@ -186,7 +186,7 @@ RTEMS_INLINE_ROUTINE Partition_Control *_Partition_Get(
ISR_lock_Context *lock_context
)
{
- return (Partition_Control *) _Objects_Get_local(
+ return (Partition_Control *) _Objects_Get(
id,
lock_context,
&_Partition_Information
diff --git a/cpukit/rtems/include/rtems/rtems/ratemonimpl.h b/cpukit/rtems/include/rtems/rtems/ratemonimpl.h
index ac0c2c5..61ebb5a 100644
--- a/cpukit/rtems/include/rtems/rtems/ratemonimpl.h
+++ b/cpukit/rtems/include/rtems/rtems/ratemonimpl.h
@@ -90,7 +90,7 @@ RTEMS_INLINE_ROUTINE Rate_monotonic_Control *_Rate_monotonic_Get(
)
{
return (Rate_monotonic_Control *)
- _Objects_Get_local( id, lock_context, &_Rate_monotonic_Information );
+ _Objects_Get( id, lock_context, &_Rate_monotonic_Information );
}
void _Rate_monotonic_Timeout( Watchdog_Control *watchdog );
diff --git a/cpukit/rtems/include/rtems/rtems/semimpl.h b/cpukit/rtems/include/rtems/rtems/semimpl.h
index 7c26c24..670b480 100644
--- a/cpukit/rtems/include/rtems/rtems/semimpl.h
+++ b/cpukit/rtems/include/rtems/rtems/semimpl.h
@@ -139,7 +139,7 @@ RTEMS_INLINE_ROUTINE Semaphore_Control *_Semaphore_Get_interrupt_disable(
ISR_lock_Context *lock_context
)
{
- return (Semaphore_Control *) _Objects_Get_local(
+ return (Semaphore_Control *) _Objects_Get(
id,
lock_context,
&_Semaphore_Information
diff --git a/cpukit/rtems/include/rtems/rtems/timerimpl.h b/cpukit/rtems/include/rtems/rtems/timerimpl.h
index 5605be7..d8581bf 100644
--- a/cpukit/rtems/include/rtems/rtems/timerimpl.h
+++ b/cpukit/rtems/include/rtems/rtems/timerimpl.h
@@ -87,7 +87,7 @@ RTEMS_INLINE_ROUTINE Timer_Control *_Timer_Get(
ISR_lock_Context *lock_context
)
{
- return (Timer_Control *) _Objects_Get_local(
+ return (Timer_Control *) _Objects_Get(
id,
lock_context,
&_Timer_Information
diff --git a/cpukit/score/include/rtems/score/objectimpl.h b/cpukit/score/include/rtems/score/objectimpl.h
index 766080e..f5beb3b 100644
--- a/cpukit/score/include/rtems/score/objectimpl.h
+++ b/cpukit/score/include/rtems/score/objectimpl.h
@@ -549,7 +549,7 @@ Objects_Name_or_id_lookup_errors _Objects_Id_to_name (
* Interrupts are now disabled and must be restored using the specified lock
* context via _ISR_lock_ISR_enable() or _ISR_lock_Release_and_ISR_enable().
*/
-Objects_Control *_Objects_Get_local(
+Objects_Control *_Objects_Get(
Objects_Id id,
ISR_lock_Context *lock_context,
const Objects_Information *information
diff --git a/cpukit/score/include/rtems/score/threadimpl.h b/cpukit/score/include/rtems/score/threadimpl.h
index ce31457..66b655d 100644
--- a/cpukit/score/include/rtems/score/threadimpl.h
+++ b/cpukit/score/include/rtems/score/threadimpl.h
@@ -580,7 +580,7 @@ RTEMS_INLINE_ROUTINE Objects_Information *_Thread_Get_objects_information(
/**
* @brief Gets a thread by its identifier.
*
- * @see _Objects_Get_local().
+ * @see _Objects_Get().
*/
Thread_Control *_Thread_Get_interrupt_disable(
Objects_Id id,
diff --git a/cpukit/score/src/objectgetlocal.c b/cpukit/score/src/objectgetlocal.c
index 2024b59..a1a81db 100644
--- a/cpukit/score/src/objectgetlocal.c
+++ b/cpukit/score/src/objectgetlocal.c
@@ -25,7 +25,7 @@
#include <rtems/score/objectimpl.h>
-Objects_Control *_Objects_Get_local(
+Objects_Control *_Objects_Get(
Objects_Id id,
ISR_lock_Context *lock_context,
const Objects_Information *information
diff --git a/cpukit/score/src/objectgetnameasstring.c b/cpukit/score/src/objectgetnameasstring.c
index f513774..ca6e1f4 100644
--- a/cpukit/score/src/objectgetnameasstring.c
+++ b/cpukit/score/src/objectgetnameasstring.c
@@ -56,7 +56,7 @@ char *_Objects_Get_name_as_string(
if ( !information )
return NULL;
- the_object = _Objects_Get_local( tmpId, &lock_context, information );
+ the_object = _Objects_Get( tmpId, &lock_context, information );
if ( the_object == NULL ) {
return NULL;
}
diff --git a/cpukit/score/src/objectidtoname.c b/cpukit/score/src/objectidtoname.c
index 115d0e9..aff3296 100644
--- a/cpukit/score/src/objectidtoname.c
+++ b/cpukit/score/src/objectidtoname.c
@@ -45,7 +45,7 @@ Objects_Name_or_id_lookup_errors _Objects_Id_to_name (
return OBJECTS_INVALID_ID;
#endif
- the_object = _Objects_Get_local(
+ the_object = _Objects_Get(
tmpId,
&lock_context,
information
diff --git a/cpukit/score/src/threadget.c b/cpukit/score/src/threadget.c
index 194b68b..61dce7d 100644
--- a/cpukit/score/src/threadget.c
+++ b/cpukit/score/src/threadget.c
@@ -39,5 +39,5 @@ Thread_Control *_Thread_Get_interrupt_disable(
}
return (Thread_Control *)
- _Objects_Get_local( id, lock_context, information );
+ _Objects_Get( id, lock_context, information );
}
More information about the vc
mailing list