From db3a3decbd387a5f9bbac7089caa479c75589b74 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Tue, 10 Oct 2017 10:03:48 +0200
Subject: score: Add _Thread_queue_Dispatch_disable()

---
 cpukit/rtems/src/semsetpriority.c   | 4 +---
 cpukit/rtems/src/taskdelete.c       | 4 +---
 cpukit/rtems/src/tasksetpriority.c  | 4 +---
 cpukit/rtems/src/tasksetscheduler.c | 5 +----
 4 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'cpukit/rtems')

diff --git a/cpukit/rtems/src/semsetpriority.c b/cpukit/rtems/src/semsetpriority.c
index d67e816f5d..508dca5a12 100644
--- a/cpukit/rtems/src/semsetpriority.c
+++ b/cpukit/rtems/src/semsetpriority.c
@@ -110,9 +110,7 @@ static rtems_status_code _Semaphore_Set_priority(
       break;
   }
 
-  cpu_self = _Thread_Dispatch_disable_critical(
-    &queue_context->Lock_context.Lock_context
-  );
+  cpu_self = _Thread_queue_Dispatch_disable( queue_context );
   _Thread_queue_Release(
     &the_semaphore->Core_control.Wait_queue,
     queue_context
diff --git a/cpukit/rtems/src/taskdelete.c b/cpukit/rtems/src/taskdelete.c
index de57fb3ec0..b7c2cd5a81 100644
--- a/cpukit/rtems/src/taskdelete.c
+++ b/cpukit/rtems/src/taskdelete.c
@@ -47,9 +47,7 @@ rtems_status_code rtems_task_delete(
   if ( the_thread == executing ) {
     Per_CPU_Control *cpu_self;
 
-    cpu_self = _Thread_Dispatch_disable_critical(
-      &context.Base.Lock_context.Lock_context
-    );
+    cpu_self = _Thread_queue_Dispatch_disable( &context.Base );
     _ISR_lock_ISR_enable( &context.Base.Lock_context.Lock_context );
 
     /*
diff --git a/cpukit/rtems/src/tasksetpriority.c b/cpukit/rtems/src/tasksetpriority.c
index c17ff1cf7f..0651d4942c 100644
--- a/cpukit/rtems/src/tasksetpriority.c
+++ b/cpukit/rtems/src/tasksetpriority.c
@@ -51,9 +51,7 @@ static rtems_status_code _RTEMS_tasks_Set_priority(
     false,
     queue_context
   );
-  cpu_self = _Thread_Dispatch_disable_critical(
-    &queue_context->Lock_context.Lock_context
-  );
+  cpu_self = _Thread_queue_Dispatch_disable( queue_context );
   _Thread_Wait_release( the_thread, queue_context );
   _Thread_Priority_update( queue_context );
   _Thread_Dispatch_enable( cpu_self );
diff --git a/cpukit/rtems/src/tasksetscheduler.c b/cpukit/rtems/src/tasksetscheduler.c
index f3b7143d7b..c5e18784f0 100644
--- a/cpukit/rtems/src/tasksetscheduler.c
+++ b/cpukit/rtems/src/tasksetscheduler.c
@@ -58,10 +58,7 @@ rtems_status_code rtems_task_set_scheduler(
     return RTEMS_INVALID_ID;
   }
 
-  cpu_self = _Thread_Dispatch_disable_critical(
-    &queue_context.Lock_context.Lock_context
-  );
-
+  cpu_self = _Thread_queue_Dispatch_disable( &queue_context );
   _Thread_Wait_acquire_critical( the_thread, &queue_context );
   _Thread_State_acquire_critical( the_thread, &state_context );
 
-- 
cgit v1.2.3