diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-27 13:26:53 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-30 16:16:21 +0200 |
commit | 0e1d11f3f0f02768ced350fcb53056c55f0c545b (patch) | |
tree | 1f7062ab130bf78d924a7e34eec62864f3d8ae6e /cpukit/rtems/include/rtems/rtems | |
parent | score: Adjust thread queue layout (diff) | |
download | rtems-0e1d11f3f0f02768ced350fcb53056c55f0c545b.tar.bz2 |
score: Add _Thread_queue_Context_set_MP_callout()
Add _Thread_queue_Context_set_MP_callout() to simplify
_Thread_queue_Context_initialize(). This makes it possible to more
easily add additional fields to Thread_queue_Context.
Diffstat (limited to '')
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/barrierimpl.h | 2 | ||||
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/messageimpl.h | 20 | ||||
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/semimpl.h | 20 |
3 files changed, 9 insertions, 33 deletions
diff --git a/cpukit/rtems/include/rtems/rtems/barrierimpl.h b/cpukit/rtems/include/rtems/rtems/barrierimpl.h index 6a98917012..91834b8362 100644 --- a/cpukit/rtems/include/rtems/rtems/barrierimpl.h +++ b/cpukit/rtems/include/rtems/rtems/barrierimpl.h @@ -74,7 +74,7 @@ RTEMS_INLINE_ROUTINE Barrier_Control *_Barrier_Get( Thread_queue_Context *queue_context ) { - _Thread_queue_Context_initialize( queue_context, NULL ); + _Thread_queue_Context_initialize( queue_context ); return (Barrier_Control *) _Objects_Get( id, &queue_context->Lock_context, &_Barrier_Information ); } diff --git a/cpukit/rtems/include/rtems/rtems/messageimpl.h b/cpukit/rtems/include/rtems/rtems/messageimpl.h index c561ff9a4b..9c1da39975 100644 --- a/cpukit/rtems/include/rtems/rtems/messageimpl.h +++ b/cpukit/rtems/include/rtems/rtems/messageimpl.h @@ -87,16 +87,12 @@ RTEMS_INLINE_ROUTINE void _Message_queue_Free ( _Objects_Free( &_Message_queue_Information, &the_message_queue->Object ); } -RTEMS_INLINE_ROUTINE Message_queue_Control *_Message_queue_Do_get( - Objects_Id id, - Thread_queue_Context *queue_context -#if defined(RTEMS_MULTIPROCESSING) - , - Thread_queue_MP_callout mp_callout -#endif +RTEMS_INLINE_ROUTINE Message_queue_Control *_Message_queue_Get( + Objects_Id id, + Thread_queue_Context *queue_context ) { - _Thread_queue_Context_initialize( queue_context, mp_callout ); + _Thread_queue_Context_initialize( queue_context ); return (Message_queue_Control *) _Objects_Get( id, &queue_context->Lock_context, @@ -104,14 +100,6 @@ RTEMS_INLINE_ROUTINE Message_queue_Control *_Message_queue_Do_get( ); } -#if defined(RTEMS_MULTIPROCESSING) - #define _Message_queue_Get( id, queue_context, mp_callout ) \ - _Message_queue_Do_get( id, queue_context, mp_callout ) -#else - #define _Message_queue_Get( id, queue_context, mp_callout ) \ - _Message_queue_Do_get( id, queue_context ) -#endif - RTEMS_INLINE_ROUTINE Message_queue_Control *_Message_queue_Allocate( void ) { return (Message_queue_Control *) diff --git a/cpukit/rtems/include/rtems/rtems/semimpl.h b/cpukit/rtems/include/rtems/rtems/semimpl.h index 21e16e99d0..a498927691 100644 --- a/cpukit/rtems/include/rtems/rtems/semimpl.h +++ b/cpukit/rtems/include/rtems/rtems/semimpl.h @@ -58,16 +58,12 @@ RTEMS_INLINE_ROUTINE void _Semaphore_Free ( _Objects_Free( &_Semaphore_Information, &the_semaphore->Object ); } -RTEMS_INLINE_ROUTINE Semaphore_Control *_Semaphore_Do_get( - Objects_Id id, - Thread_queue_Context *queue_context -#if defined(RTEMS_MULTIPROCESSING) - , - Thread_queue_MP_callout mp_callout -#endif +RTEMS_INLINE_ROUTINE Semaphore_Control *_Semaphore_Get( + Objects_Id id, + Thread_queue_Context *queue_context ) { - _Thread_queue_Context_initialize( queue_context, mp_callout ); + _Thread_queue_Context_initialize( queue_context ); return (Semaphore_Control *) _Objects_Get( id, &queue_context->Lock_context, @@ -75,14 +71,6 @@ RTEMS_INLINE_ROUTINE Semaphore_Control *_Semaphore_Do_get( ); } -#if defined(RTEMS_MULTIPROCESSING) - #define _Semaphore_Get( id, queue_context, mp_callout ) \ - _Semaphore_Do_get( id, queue_context, mp_callout ) -#else - #define _Semaphore_Get( id, queue_context, mp_callout ) \ - _Semaphore_Do_get( id, queue_context ) -#endif - #ifdef __cplusplus } #endif |