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.

1 files changed, 7 insertions, 11 deletions

diff --git a/cpukit/score/src/coremsgbroadcast.c b/cpukit/score/src/coremsgbroadcast.c
index a7a962f16f..23dd343c05 100644
--- a/cpukit/score/src/coremsgbroadcast.c
+++ b/cpukit/score/src/coremsgbroadcast.c
@@ -21,28 +21,25 @@
 #include <rtems/score/coremsgimpl.h>
 #include <rtems/score/objectimpl.h>
 
-CORE_message_queue_Status _CORE_message_queue_Do_broadcast(
+CORE_message_queue_Status _CORE_message_queue_Broadcast(
   CORE_message_queue_Control *the_message_queue,
   const void                 *buffer,
   size_t                      size,
-#if defined(RTEMS_MULTIPROCESSING)
-  Thread_queue_MP_callout     mp_callout,
-#endif
   uint32_t                   *count,
-  ISR_lock_Context           *lock_context
+  Thread_queue_Context       *queue_context
 )
 {
   Thread_Control             *the_thread;
   uint32_t                    number_broadcasted;
 
   if ( size > the_message_queue->maximum_message_size ) {
-    _ISR_lock_ISR_enable( lock_context );
+    _ISR_lock_ISR_enable( &queue_context->Lock_context );
     return CORE_MESSAGE_QUEUE_STATUS_INVALID_SIZE;
   }
 
   number_broadcasted = 0;
 
-  _CORE_message_queue_Acquire_critical( the_message_queue, lock_context );
+  _CORE_message_queue_Acquire_critical( the_message_queue, queue_context );
 
   while (
     ( the_thread =
@@ -50,18 +47,17 @@ CORE_message_queue_Status _CORE_message_queue_Do_broadcast(
         the_message_queue,
         buffer,
         size,
-        mp_callout,
         0,
-        lock_context
+        queue_context
       )
     )
   ) {
     number_broadcasted += 1;
 
-    _CORE_message_queue_Acquire( the_message_queue, lock_context );
+    _CORE_message_queue_Acquire( the_message_queue, queue_context );
   }
 
-  _CORE_message_queue_Release( the_message_queue, lock_context );
+  _CORE_message_queue_Release( the_message_queue, queue_context );
 
   *count = number_broadcasted;
   return CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL;