forked from Imagelibrary/rtems
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.
This commit is contained in:
@@ -82,7 +82,7 @@ RTEMS_INLINE_ROUTINE POSIX_Barrier_Control *_POSIX_Barrier_Get (
|
|||||||
ISR_lock_Context *lock_context
|
ISR_lock_Context *lock_context
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
return (POSIX_Barrier_Control *) _Objects_Get_local(
|
return (POSIX_Barrier_Control *) _Objects_Get(
|
||||||
(Objects_Id) *barrier,
|
(Objects_Id) *barrier,
|
||||||
lock_context,
|
lock_context,
|
||||||
&_POSIX_Barrier_Information
|
&_POSIX_Barrier_Information
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ RTEMS_INLINE_ROUTINE POSIX_Message_queue_Control *_POSIX_Message_queue_Get(
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
return (POSIX_Message_queue_Control *)
|
return (POSIX_Message_queue_Control *)
|
||||||
_Objects_Get_local( id, lock_context, &_POSIX_Message_queue_Information );
|
_Objects_Get( id, lock_context, &_POSIX_Message_queue_Information );
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -80,14 +80,14 @@ RTEMS_INLINE_ROUTINE int _POSIX_Get_by_name_error(
|
|||||||
if ( id == NULL ) { \
|
if ( id == NULL ) { \
|
||||||
return 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 ) { \
|
if ( the_object == NULL ) { \
|
||||||
_Once_Lock(); \
|
_Once_Lock(); \
|
||||||
if ( *id == initializer ) { \
|
if ( *id == initializer ) { \
|
||||||
init( id, NULL ); \
|
init( id, NULL ); \
|
||||||
} \
|
} \
|
||||||
_Once_Unlock(); \
|
_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
|
return (type *) the_object
|
||||||
|
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Get(
|
|||||||
ISR_lock_Context *lock_context
|
ISR_lock_Context *lock_context
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
return (POSIX_Semaphore_Control *) _Objects_Get_local(
|
return (POSIX_Semaphore_Control *) _Objects_Get(
|
||||||
(Objects_Id) *id,
|
(Objects_Id) *id,
|
||||||
lock_context,
|
lock_context,
|
||||||
&_POSIX_Semaphore_Information
|
&_POSIX_Semaphore_Information
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ RTEMS_INLINE_ROUTINE POSIX_Spinlock_Control *_POSIX_Spinlock_Get(
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (POSIX_Spinlock_Control *) _Objects_Get_local(
|
return (POSIX_Spinlock_Control *) _Objects_Get(
|
||||||
*spinlock,
|
*spinlock,
|
||||||
lock_context,
|
lock_context,
|
||||||
&_POSIX_Spinlock_Information
|
&_POSIX_Spinlock_Information
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ RTEMS_INLINE_ROUTINE POSIX_Timer_Control *_POSIX_Timer_Get (
|
|||||||
ISR_lock_Context *lock_context
|
ISR_lock_Context *lock_context
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
return (POSIX_Timer_Control *) _Objects_Get_local(
|
return (POSIX_Timer_Control *) _Objects_Get(
|
||||||
(Objects_Id) id,
|
(Objects_Id) id,
|
||||||
lock_context,
|
lock_context,
|
||||||
&_POSIX_Timer_Information
|
&_POSIX_Timer_Information
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ RTEMS_INLINE_ROUTINE Barrier_Control *_Barrier_Get(
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
return (Barrier_Control *)
|
return (Barrier_Control *)
|
||||||
_Objects_Get_local( id, lock_context, &_Barrier_Information );
|
_Objects_Get( id, lock_context, &_Barrier_Information );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ RTEMS_INLINE_ROUTINE Dual_ported_memory_Control *_Dual_ported_memory_Get(
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
return (Dual_ported_memory_Control *)
|
return (Dual_ported_memory_Control *)
|
||||||
_Objects_Get_local( id, lock_context, &_Dual_ported_memory_Information );
|
_Objects_Get( id, lock_context, &_Dual_ported_memory_Information );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**@}*/
|
/**@}*/
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ _Message_queue_Get_interrupt_disable(
|
|||||||
ISR_lock_Context *lock_context
|
ISR_lock_Context *lock_context
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
return (Message_queue_Control *) _Objects_Get_local(
|
return (Message_queue_Control *) _Objects_Get(
|
||||||
id,
|
id,
|
||||||
lock_context,
|
lock_context,
|
||||||
&_Message_queue_Information
|
&_Message_queue_Information
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ RTEMS_INLINE_ROUTINE Partition_Control *_Partition_Get(
|
|||||||
ISR_lock_Context *lock_context
|
ISR_lock_Context *lock_context
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
return (Partition_Control *) _Objects_Get_local(
|
return (Partition_Control *) _Objects_Get(
|
||||||
id,
|
id,
|
||||||
lock_context,
|
lock_context,
|
||||||
&_Partition_Information
|
&_Partition_Information
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ RTEMS_INLINE_ROUTINE Rate_monotonic_Control *_Rate_monotonic_Get(
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
return (Rate_monotonic_Control *)
|
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 );
|
void _Rate_monotonic_Timeout( Watchdog_Control *watchdog );
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ RTEMS_INLINE_ROUTINE Semaphore_Control *_Semaphore_Get_interrupt_disable(
|
|||||||
ISR_lock_Context *lock_context
|
ISR_lock_Context *lock_context
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
return (Semaphore_Control *) _Objects_Get_local(
|
return (Semaphore_Control *) _Objects_Get(
|
||||||
id,
|
id,
|
||||||
lock_context,
|
lock_context,
|
||||||
&_Semaphore_Information
|
&_Semaphore_Information
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ RTEMS_INLINE_ROUTINE Timer_Control *_Timer_Get(
|
|||||||
ISR_lock_Context *lock_context
|
ISR_lock_Context *lock_context
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
return (Timer_Control *) _Objects_Get_local(
|
return (Timer_Control *) _Objects_Get(
|
||||||
id,
|
id,
|
||||||
lock_context,
|
lock_context,
|
||||||
&_Timer_Information
|
&_Timer_Information
|
||||||
|
|||||||
@@ -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
|
* 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().
|
* 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,
|
Objects_Id id,
|
||||||
ISR_lock_Context *lock_context,
|
ISR_lock_Context *lock_context,
|
||||||
const Objects_Information *information
|
const Objects_Information *information
|
||||||
|
|||||||
@@ -580,7 +580,7 @@ RTEMS_INLINE_ROUTINE Objects_Information *_Thread_Get_objects_information(
|
|||||||
/**
|
/**
|
||||||
* @brief Gets a thread by its identifier.
|
* @brief Gets a thread by its identifier.
|
||||||
*
|
*
|
||||||
* @see _Objects_Get_local().
|
* @see _Objects_Get().
|
||||||
*/
|
*/
|
||||||
Thread_Control *_Thread_Get_interrupt_disable(
|
Thread_Control *_Thread_Get_interrupt_disable(
|
||||||
Objects_Id id,
|
Objects_Id id,
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
#include <rtems/score/objectimpl.h>
|
#include <rtems/score/objectimpl.h>
|
||||||
|
|
||||||
Objects_Control *_Objects_Get_local(
|
Objects_Control *_Objects_Get(
|
||||||
Objects_Id id,
|
Objects_Id id,
|
||||||
ISR_lock_Context *lock_context,
|
ISR_lock_Context *lock_context,
|
||||||
const Objects_Information *information
|
const Objects_Information *information
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ char *_Objects_Get_name_as_string(
|
|||||||
if ( !information )
|
if ( !information )
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
the_object = _Objects_Get_local( tmpId, &lock_context, information );
|
the_object = _Objects_Get( tmpId, &lock_context, information );
|
||||||
if ( the_object == NULL ) {
|
if ( the_object == NULL ) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ Objects_Name_or_id_lookup_errors _Objects_Id_to_name (
|
|||||||
return OBJECTS_INVALID_ID;
|
return OBJECTS_INVALID_ID;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
the_object = _Objects_Get_local(
|
the_object = _Objects_Get(
|
||||||
tmpId,
|
tmpId,
|
||||||
&lock_context,
|
&lock_context,
|
||||||
information
|
information
|
||||||
|
|||||||
@@ -39,5 +39,5 @@ Thread_Control *_Thread_Get_interrupt_disable(
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (Thread_Control *)
|
return (Thread_Control *)
|
||||||
_Objects_Get_local( id, lock_context, information );
|
_Objects_Get( id, lock_context, information );
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user