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.

2 files changed, 9 insertions, 8 deletions

diff --git a/testsuites/sptests/spintrcritical22/init.c b/testsuites/sptests/spintrcritical22/init.c
index b5044d915f..3670d1ae8d 100644
--- a/testsuites/sptests/spintrcritical22/init.c
+++ b/testsuites/sptests/spintrcritical22/init.c
@@ -33,12 +33,12 @@ static test_context ctx_instance;
 
 static Semaphore_Control *get_semaphore_control(rtems_id id)
 {
-  ISR_lock_Context lock_context;
+  Thread_queue_Context queue_context;
   Semaphore_Control *sem;
 
-  sem = _Semaphore_Get(id, &lock_context);
+  sem = _Semaphore_Get(id, &queue_context, NULL);
   rtems_test_assert(sem != NULL);
-  _ISR_lock_ISR_enable(&lock_context);
+  _ISR_lock_ISR_enable(&queue_context.Lock_context);
 
   return sem;
 }
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index da37eee73e..68cb246cd0 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -477,9 +477,10 @@ rtems_task Floating_point_task_2(
 
 void complete_test( void )
 {
-  uint32_t         index;
-  rtems_id         task_id;
-  ISR_lock_Context lock_context;
+  uint32_t             index;
+  rtems_id             task_id;
+  ISR_lock_Context     lock_context;
+  Thread_queue_Context queue_context;
 
   benchmark_timer_initialize();
     thread_resume( Middle_tcb );
@@ -513,8 +514,8 @@ void complete_test( void )
 
   benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-      (void) _Semaphore_Get( Semaphore_id, &lock_context );
-      _ISR_lock_ISR_enable( &lock_context );
+      (void) _Semaphore_Get( Semaphore_id, &queue_context, NULL );
+      _ISR_lock_ISR_enable( &queue_context.Lock_context );
     }
   semaphore_get_time = benchmark_timer_read();