score: Get rid of mp_id parameter

Get rid of the mp_id parameter used for some thread queue methods.  Use
THREAD_QUEUE_QUEUE_TO_OBJECT() instead.

6 files changed, 8 insertions, 92 deletions

diff --git a/cpukit/score/include/rtems/score/corebarrierimpl.h b/cpukit/score/include/rtems/score/corebarrierimpl.h
index cd253b3815..d5133cd1cf 100644
--- a/cpukit/score/include/rtems/score/corebarrierimpl.h
+++ b/cpukit/score/include/rtems/score/corebarrierimpl.h
@@ -105,7 +105,6 @@ void _CORE_barrier_Do_seize(
   Watchdog_Interval        timeout,
 #if defined(RTEMS_MULTIPROCESSING)
   Thread_queue_MP_callout  mp_callout,
-  Objects_Id               mp_id,
 #endif
   ISR_lock_Context        *lock_context
 );
@@ -125,7 +124,6 @@ void _CORE_barrier_Do_seize(
  *         to wait if @a wait is true.
  *  @param[in] mp_callout is the routine to invoke if the
  *         thread unblocked is remote
- *  @param[in] mp_id is the id of the object being waited upon
  *
  * @note Status is returned via the thread control block.
  */
@@ -136,7 +134,6 @@ void _CORE_barrier_Do_seize(
     wait, \
     timeout, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _CORE_barrier_Do_seize( \
@@ -145,7 +142,6 @@ void _CORE_barrier_Do_seize(
       wait, \
       timeout, \
       mp_callout, \
-      mp_id, \
       lock_context \
     )
 #else
@@ -155,7 +151,6 @@ void _CORE_barrier_Do_seize(
     wait, \
     timeout, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _CORE_barrier_Do_seize( \
@@ -172,7 +167,6 @@ uint32_t _CORE_barrier_Do_surrender(
   Thread_queue_Flush_filter  filter,
 #if defined(RTEMS_MULTIPROCESSING)
   Thread_queue_MP_callout    mp_callout,
-  Objects_Id                 mp_id,
 #endif
   ISR_lock_Context          *lock_context
 );
@@ -186,7 +180,6 @@ uint32_t _CORE_barrier_Do_surrender(
  *  @param[in] the_barrier is the barrier to surrender
  *  @param[in] mp_callout is the routine to invoke if the
  *         thread unblocked is remote
- *  @param[in] mp_id is the id of the object for a remote unblock
  *
  *  @retval the number of unblocked threads
  */
@@ -194,21 +187,18 @@ uint32_t _CORE_barrier_Do_surrender(
   #define _CORE_barrier_Surrender( \
     the_barrier, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _CORE_barrier_Do_surrender( \
       the_barrier, \
       _Thread_queue_Flush_default_filter, \
       mp_callout, \
-      mp_id, \
       lock_context \
     )
 #else
   #define _CORE_barrier_Surrender( \
     the_barrier, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _CORE_barrier_Do_surrender( \
@@ -229,21 +219,18 @@ Thread_Control *_CORE_barrier_Was_deleted(
   #define _CORE_barrier_Flush( \
     the_barrier, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _CORE_barrier_Do_surrender( \
       the_barrier, \
       _CORE_barrier_Was_deleted, \
       mp_callout, \
-      mp_id, \
       lock_context \
     )
 #else
   #define _CORE_barrier_Flush( \
     the_barrier, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _CORE_barrier_Do_surrender( \
diff --git a/cpukit/score/include/rtems/score/coremsgimpl.h b/cpukit/score/include/rtems/score/coremsgimpl.h
index 395d44dafd..4113aa6d5d 100644
--- a/cpukit/score/include/rtems/score/coremsgimpl.h
+++ b/cpukit/score/include/rtems/score/coremsgimpl.h
@@ -130,7 +130,6 @@ void _CORE_message_queue_Do_close(
   CORE_message_queue_Control *the_message_queue,
 #if defined(RTEMS_MULTIPROCESSING)
   Thread_queue_MP_callout     mp_callout,
-  Objects_Id                  mp_id,
 #endif
   ISR_lock_Context           *lock_context
 );
@@ -148,7 +147,6 @@ void _CORE_message_queue_Do_close(
  *  @param[in] the_message_queue points to the message queue to close
  *  @param[in] mp_callout is the routine to call for each thread
  *         that is extracted from the set of waiting threads
- *  @param[in] mp_id the object identifier of the message queue object
  *  @param[in] lock_context The lock context of the
  *    _CORE_message_queue_Acquire() or _CORE_message_queue_Acquire_critical().
  */
@@ -156,20 +154,17 @@ void _CORE_message_queue_Do_close(
   #define _CORE_message_queue_Close( \
     the_message_queue, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _CORE_message_queue_Do_close( \
       the_message_queue, \
       mp_callout, \
-      mp_id, \
       lock_context \
     )
 #else
   #define _CORE_message_queue_Close( \
     the_message_queue, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _CORE_message_queue_Do_close( \
@@ -221,7 +216,6 @@ CORE_message_queue_Status _CORE_message_queue_Do_broadcast(
   size_t                      size,
 #if defined(RTEMS_MULTIPROCESSING)
   Thread_queue_MP_callout     mp_callout,
-  Objects_Id                  mp_id,
 #endif
   uint32_t                   *count,
   ISR_lock_Context           *lock_context
@@ -242,8 +236,6 @@ CORE_message_queue_Status _CORE_message_queue_Do_broadcast(
  *  @param[in] size is the size of the message being broadcast
  *  @param[in] mp_callout is the routine to invoke if
  *         a thread that is unblocked is actually a remote thread.
- *  @param[in] mp_id is the RTEMS object Id associated with this message queue.
- *         It is used when unblocking a remote thread.
  *  @param[out] count points to the variable that will contain the
  *         number of tasks that are sent this message
  *  @param[in] lock_context The lock context of the interrupt disable.
@@ -256,7 +248,6 @@ CORE_message_queue_Status _CORE_message_queue_Do_broadcast(
     buffer, \
     size, \
     mp_callout, \
-    mp_id, \
     count, \
     lock_context \
   ) \
@@ -265,7 +256,6 @@ CORE_message_queue_Status _CORE_message_queue_Do_broadcast(
       buffer, \
       size, \
       mp_callout, \
-      mp_id, \
       count, \
       lock_context \
     )
@@ -275,7 +265,6 @@ CORE_message_queue_Status _CORE_message_queue_Do_broadcast(
     buffer, \
     size, \
     mp_callout, \
-    mp_id, \
     count, \
     lock_context \
   ) \
@@ -295,7 +284,6 @@ CORE_message_queue_Status _CORE_message_queue_Do_submit(
   size_t                            size,
 #if defined(RTEMS_MULTIPROCESSING)
   Thread_queue_MP_callout           mp_callout,
-  Objects_Id                        mp_id,
 #endif
   CORE_message_queue_Submit_types   submit_type,
   bool                              wait,
@@ -318,8 +306,6 @@ CORE_message_queue_Status _CORE_message_queue_Do_submit(
  *  @param[in] size is the size of the message being send
  *  @param[in] mp_callout is the routine to invoke if
  *         a thread that is unblocked is actually a remote thread.
- *  @param[in] mp_id is the RTEMS object Id associated with this message queue.
- *         It is used when unblocking a remote thread.
  *  @param[in] submit_type determines whether the message is prepended,
  *         appended, or enqueued in priority order.
  *  @param[in] wait indicates whether the calling thread is willing to block
@@ -336,7 +322,6 @@ CORE_message_queue_Status _CORE_message_queue_Do_submit(
     buffer, \
     size, \
     mp_callout, \
-    mp_id, \
     submit_type, \
     wait, \
     timeout, \
@@ -348,7 +333,6 @@ CORE_message_queue_Status _CORE_message_queue_Do_submit(
       buffer, \
       size, \
       mp_callout, \
-      mp_id, \
       submit_type, \
       wait, \
       timeout, \
@@ -361,7 +345,6 @@ CORE_message_queue_Status _CORE_message_queue_Do_submit(
     buffer, \
     size, \
     mp_callout, \
-    mp_id, \
     submit_type, \
     wait, \
     timeout, \
@@ -451,7 +434,6 @@ void _CORE_message_queue_Insert_message(
   buffer, \
   size, \
   mp_callout, \
-  mp_id, \
   wait, \
   timeout, \
   lock_context \
@@ -462,7 +444,6 @@ void _CORE_message_queue_Insert_message(
     buffer, \
     size, \
     mp_callout, \
-    mp_id, \
     CORE_MESSAGE_QUEUE_SEND_REQUEST, \
     wait, \
     timeout, \
@@ -477,7 +458,6 @@ void _CORE_message_queue_Insert_message(
   buffer, \
   size, \
   mp_callout, \
-  mp_id, \
   wait, \
   timeout, \
   lock_context \
@@ -488,7 +468,6 @@ void _CORE_message_queue_Insert_message(
     buffer, \
     size, \
     mp_callout, \
-    mp_id, \
     CORE_MESSAGE_QUEUE_URGENT_REQUEST, \
     wait,\
     timeout, \
@@ -624,7 +603,6 @@ RTEMS_INLINE_ROUTINE Thread_Control *_CORE_message_queue_Do_dequeue_receiver(
   size_t                           size,
 #if defined(RTEMS_MULTIPROCESSING)
   Thread_queue_MP_callout          mp_callout,
-  Objects_Id                       mp_id,
 #endif
   CORE_message_queue_Submit_types  submit_type,
   ISR_lock_Context                *lock_context
@@ -670,7 +648,6 @@ RTEMS_INLINE_ROUTINE Thread_Control *_CORE_message_queue_Do_dequeue_receiver(
     the_message_queue->operations,
     the_thread,
     mp_callout,
-    mp_id,
     lock_context
   );
 
@@ -683,7 +660,6 @@ RTEMS_INLINE_ROUTINE Thread_Control *_CORE_message_queue_Do_dequeue_receiver(
     buffer, \
     size, \
     mp_callout, \
-    mp_id, \
     submit_type, \
     lock_context \
   ) \
@@ -692,7 +668,6 @@ RTEMS_INLINE_ROUTINE Thread_Control *_CORE_message_queue_Do_dequeue_receiver(
       buffer, \
       size, \
       mp_callout, \
-      mp_id, \
       submit_type, \
       lock_context \
     )
@@ -702,7 +677,6 @@ RTEMS_INLINE_ROUTINE Thread_Control *_CORE_message_queue_Do_dequeue_receiver(
     buffer, \
     size, \
     mp_callout, \
-    mp_id, \
     submit_type, \
     lock_context \
   ) \
diff --git a/cpukit/score/include/rtems/score/coremuteximpl.h b/cpukit/score/include/rtems/score/coremuteximpl.h
index 34a9972c9e..4531e46e87 100644
--- a/cpukit/score/include/rtems/score/coremuteximpl.h
+++ b/cpukit/score/include/rtems/score/coremuteximpl.h
@@ -374,7 +374,6 @@ CORE_mutex_Status _CORE_mutex_Do_surrender(
   CORE_mutex_Control      *the_mutex,
 #if defined(RTEMS_MULTIPROCESSING)
   Thread_queue_MP_callout  mp_callout,
-  Objects_Id               mp_id,
 #endif
   ISR_lock_Context        *lock_context
 );
@@ -383,20 +382,17 @@ CORE_mutex_Status _CORE_mutex_Do_surrender(
   #define _CORE_mutex_Surrender( \
     the_mutex, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _CORE_mutex_Do_surrender( \
       the_mutex, \
       mp_callout, \
-      mp_id, \
       lock_context \
     )
 #else
   #define _CORE_mutex_Surrender( \
     the_mutex, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _CORE_mutex_Do_surrender( \
@@ -422,7 +418,6 @@ Thread_Control *_CORE_mutex_Unsatisfied_nowait(
   the_mutex, \
   filter, \
   mp_callout, \
-  mp_id, \
   lock_context \
 ) \
   _Thread_queue_Flush_critical( \
@@ -430,7 +425,6 @@ Thread_Control *_CORE_mutex_Unsatisfied_nowait(
     ( the_mutex )->operations, \
     filter, \
     mp_callout, \
-    mp_id, \
     lock_context \
   )
 
diff --git a/cpukit/score/include/rtems/score/coresemimpl.h b/cpukit/score/include/rtems/score/coresemimpl.h
index a06fcb5f2b..0e04cc930c 100644
--- a/cpukit/score/include/rtems/score/coresemimpl.h
+++ b/cpukit/score/include/rtems/score/coresemimpl.h
@@ -117,7 +117,6 @@ Thread_Control *_CORE_semaphore_Unsatisfied_nowait(
 #define _CORE_semaphore_Destroy( \
   the_semaphore, \
   mp_callout, \
-  mp_id, \
   lock_context \
 ) \
   do { \
@@ -126,7 +125,6 @@ Thread_Control *_CORE_semaphore_Unsatisfied_nowait(
       ( the_semaphore )->operations, \
       _CORE_semaphore_Was_deleted, \
       mp_callout, \
-      mp_id, \
       lock_context \
     ); \
     _Thread_queue_Destroy( &( the_semaphore )->Wait_queue ); \
@@ -136,7 +134,6 @@ RTEMS_INLINE_ROUTINE CORE_semaphore_Status _CORE_semaphore_Do_surrender(
   CORE_semaphore_Control  *the_semaphore,
 #if defined(RTEMS_MULTIPROCESSING)
   Thread_queue_MP_callout  mp_callout,
-  Objects_Id               mp_id,
 #endif
   ISR_lock_Context        *lock_context
 )
@@ -158,7 +155,6 @@ RTEMS_INLINE_ROUTINE CORE_semaphore_Status _CORE_semaphore_Do_surrender(
       the_semaphore->operations,
       the_thread,
       mp_callout,
-      mp_id,
       lock_context
     );
   } else {
@@ -183,8 +179,6 @@ RTEMS_INLINE_ROUTINE CORE_semaphore_Status _CORE_semaphore_Do_surrender(
  *  @param[in] the_semaphore is the semaphore to surrender
  *  @param[in] mp_callout is the routine to invoke if the
  *         thread unblocked is remote
- *  @param[in] mp_id is the Id of the API level Semaphore object associated
- *         with this instance of a SuperCore Semaphore
  *  @param[in] lock_context is a temporary variable used to contain the ISR
  *        disable level cookie
  *
@@ -194,20 +188,17 @@ RTEMS_INLINE_ROUTINE CORE_semaphore_Status _CORE_semaphore_Do_surrender(
   #define _CORE_semaphore_Surrender( \
     the_semaphore, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _CORE_semaphore_Do_surrender( \
       the_semaphore, \
       mp_callout, \
-      mp_id, \
       lock_context \
     )
 #else
   #define _CORE_semaphore_Surrender( \
     the_semaphore, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _CORE_semaphore_Do_surrender( \
@@ -220,7 +211,6 @@ RTEMS_INLINE_ROUTINE CORE_semaphore_Status _CORE_semaphore_Do_surrender(
 #define _CORE_semaphore_Flush( \
   the_semaphore, \
   mp_callout, \
-  mp_id, \
   lock_context \
 ) \
   do { \
@@ -229,7 +219,6 @@ RTEMS_INLINE_ROUTINE CORE_semaphore_Status _CORE_semaphore_Do_surrender(
       ( the_semaphore )->operations, \
       _CORE_semaphore_Unsatisfied_nowait, \
       mp_callout, \
-      mp_id, \
       lock_context \
     ); \
   } while ( 0 )
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h
index 8672fddfd2..ee19c0430f 100644
--- a/cpukit/score/include/rtems/score/thread.h
+++ b/cpukit/score/include/rtems/score/thread.h
@@ -404,12 +404,6 @@ typedef struct {
   Thread_queue_MP_callout  thread_queue_callout;
 
   /**
-   * @brief Thread queue object identifier for
-   * _Thread_queue_Enqueue_critical().
-   */
-  Objects_Id               thread_queue_id;
-
-  /**
    * @brief This field is used to manage the set of active proxies in the system.
    */
   RBTree_Node              Active;
diff --git a/cpukit/score/include/rtems/score/threadqimpl.h b/cpukit/score/include/rtems/score/threadqimpl.h
index f24e48c29f..011c410fa1 100644
--- a/cpukit/score/include/rtems/score/threadqimpl.h
+++ b/cpukit/score/include/rtems/score/threadqimpl.h
@@ -201,8 +201,7 @@ Thread_Control *_Thread_queue_Do_dequeue(
   const Thread_queue_Operations *operations
 #if defined(RTEMS_MULTIPROCESSING)
   ,
-  Thread_queue_MP_callout        mp_callout,
-  Objects_Id                     mp_id
+  Thread_queue_MP_callout        mp_callout
 #endif
 );
 
@@ -221,21 +220,18 @@ Thread_Control *_Thread_queue_Do_dequeue(
   #define _Thread_queue_Dequeue( \
     the_thread_queue, \
     operations, \
-    mp_callout, \
-    mp_id \
+    mp_callout \
   ) \
     _Thread_queue_Do_dequeue( \
       the_thread_queue, \
       operations, \
-      mp_callout, \
-      mp_id \
+      mp_callout \
     )
 #else
   #define _Thread_queue_Dequeue( \
     the_thread_queue, \
     operations, \
-    mp_callout, \
-    mp_id \
+    mp_callout \
   ) \
     _Thread_queue_Do_dequeue( \
       the_thread_queue, \
@@ -348,8 +344,7 @@ bool _Thread_queue_Do_extract_locked(
   Thread_Control                *the_thread
 #if defined(RTEMS_MULTIPROCESSING)
   ,
-  Thread_queue_MP_callout        mp_callout,
-  Objects_Id                     mp_id
+  Thread_queue_MP_callout        mp_callout
 #endif
 );
 
@@ -366,8 +361,6 @@ bool _Thread_queue_Do_extract_locked(
  * @param[in] mp_callout Callout to unblock the thread in case it is actually a
  *   thread proxy.  This parameter is only used on multiprocessing
  *   configurations.
- * @param[in] mp_id Object identifier of the object containing the thread
- *   queue.  This parameter is only used on multiprocessing configurations.
  *
  * @return Returns the unblock indicator for _Thread_queue_Unblock_critical().
  * True indicates, that this thread must be unblocked by the scheduler later in
@@ -382,23 +375,20 @@ bool _Thread_queue_Do_extract_locked(
     unblock, \
     queue, \
     the_thread, \
-    mp_callout, \
-    mp_id \
+    mp_callout \
   ) \
     _Thread_queue_Do_extract_locked( \
       unblock, \
       queue, \
       the_thread, \
-      mp_callout, \
-      mp_id \
+      mp_callout \
     )
 #else
   #define _Thread_queue_Extract_locked( \
     unblock, \
     queue, \
     the_thread, \
-    mp_callout, \
-    mp_id \
+    mp_callout \
   ) \
     _Thread_queue_Do_extract_locked( \
       unblock, \
@@ -434,7 +424,6 @@ void _Thread_queue_Do_extract_critical(
   Thread_Control                *the_thread,
 #if defined(RTEMS_MULTIPROCESSING)
   Thread_queue_MP_callout        mp_callout,
-  Objects_Id                     mp_id,
 #endif
   ISR_lock_Context              *lock_context
 );
@@ -487,8 +476,6 @@ void _Thread_queue_Do_extract_critical(
  * @param[in] mp_callout Callout to unblock the thread in case it is actually a
  *   thread proxy.  This parameter is only used on multiprocessing
  *   configurations.
- * @param[in] mp_id Object identifier of the object containing the thread
- *   queue.  This parameter is only used on multiprocessing configurations.
  * @param[in] lock_context The lock context of the lock acquire.
  */
 #if defined(RTEMS_MULTIPROCESSING)
@@ -497,7 +484,6 @@ void _Thread_queue_Do_extract_critical(
     operations, \
     the_thread, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _Thread_queue_Do_extract_critical( \
@@ -505,7 +491,6 @@ void _Thread_queue_Do_extract_critical(
       operations, \
       the_thread, \
       mp_callout, \
-      mp_id, \
       lock_context \
     )
 #else
@@ -514,7 +499,6 @@ void _Thread_queue_Do_extract_critical(
     operations, \
     the_thread, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _Thread_queue_Do_extract_critical( \
@@ -644,7 +628,6 @@ size_t _Thread_queue_Do_flush_critical(
   Thread_queue_Flush_filter      filter,
 #if defined(RTEMS_MULTIPROCESSING)
   Thread_queue_MP_callout        mp_callout,
-  Objects_Id                     mp_id,
 #endif
   ISR_lock_Context              *lock_context
 );
@@ -666,8 +649,6 @@ size_t _Thread_queue_Do_flush_critical(
  *   operation should stop or continue.
  * @param mp_callout Callout to extract the proxy of a remote thread.  This
  *   parameter is only used on multiprocessing configurations.
- * @param mp_id Object identifier of the object containing the thread queue.
- *   This parameter is only used on multiprocessing configurations.
  *
  * @return The count of extracted threads.
  */
@@ -677,7 +658,6 @@ size_t _Thread_queue_Do_flush_critical(
     operations, \
     filter, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _Thread_queue_Do_flush_critical( \
@@ -685,7 +665,6 @@ size_t _Thread_queue_Do_flush_critical(
       operations, \
       filter, \
       mp_callout, \
-      mp_id, \
       lock_context \
     )
 #else
@@ -694,7 +673,6 @@ size_t _Thread_queue_Do_flush_critical(
     operations, \
     filter, \
     mp_callout, \
-    mp_id, \
     lock_context \
   ) \
     _Thread_queue_Do_flush_critical( \