score: Move thread queue MP callout to context

Drop the multiprocessing (MP) dependent callout parameter from the
thread queue extract, dequeue, flush and unblock methods.  Merge this
parameter with the lock context into new structure Thread_queue_Context.
This helps to gets rid of the conditionally compiled method call
helpers.

3 files changed, 38 insertions, 11 deletions

diff --git a/cpukit/rtems/include/rtems/rtems/barrierimpl.h b/cpukit/rtems/include/rtems/rtems/barrierimpl.h
index 39632fcd00..0eaadfc046 100644
--- a/cpukit/rtems/include/rtems/rtems/barrierimpl.h
+++ b/cpukit/rtems/include/rtems/rtems/barrierimpl.h
@@ -70,12 +70,13 @@ RTEMS_INLINE_ROUTINE void _Barrier_Free (
 }
 
 RTEMS_INLINE_ROUTINE Barrier_Control *_Barrier_Get(
-  Objects_Id        id,
-  ISR_lock_Context *lock_context
+  Objects_Id            id,
+  Thread_queue_Context *queue_context
 )
 {
+  _Thread_queue_Context_initialize( queue_context, NULL );
   return (Barrier_Control *)
-    _Objects_Get( id, lock_context, &_Barrier_Information );
+    _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 199af1cacb..d6217f171e 100644
--- a/cpukit/rtems/include/rtems/rtems/messageimpl.h
+++ b/cpukit/rtems/include/rtems/rtems/messageimpl.h
@@ -101,18 +101,31 @@ RTEMS_INLINE_ROUTINE void _Message_queue_Free (
   _Objects_Free( &_Message_queue_Information, &the_message_queue->Object );
 }
 
-RTEMS_INLINE_ROUTINE Message_queue_Control * _Message_queue_Get(
-  Objects_Id         id,
-  ISR_lock_Context  *lock_context
+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
 )
 {
+  _Thread_queue_Context_initialize( queue_context, mp_callout );
   return (Message_queue_Control *) _Objects_Get(
     id,
-    lock_context,
+    &queue_context->Lock_context,
     &_Message_queue_Information
   );
 }
 
+#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 ac55bc7354..c23bef905a 100644
--- a/cpukit/rtems/include/rtems/rtems/semimpl.h
+++ b/cpukit/rtems/include/rtems/rtems/semimpl.h
@@ -134,18 +134,31 @@ RTEMS_INLINE_ROUTINE void _Semaphore_Free (
   _Objects_Free( &_Semaphore_Information, &the_semaphore->Object );
 }
 
-RTEMS_INLINE_ROUTINE Semaphore_Control *_Semaphore_Get(
-  Objects_Id         id,
-  ISR_lock_Context  *lock_context
+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
 )
 {
+  _Thread_queue_Context_initialize( queue_context, mp_callout );
   return (Semaphore_Control *) _Objects_Get(
     id,
-    lock_context,
+    &queue_context->Lock_context,
     &_Semaphore_Information
   );
 }
 
+#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