From 3692095f2c922d35482af0a22d20d21f84c0159b Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 30 May 2016 10:41:22 +0200
Subject: rtems: Move MrsP semaphore operations

Move MrsP semaphore operations to a less prominent location.  Fix field
name.
---
 cpukit/libmisc/monitor/mon-sema.c      |  2 +-
 cpukit/rtems/include/rtems/rtems/sem.h |  2 +-
 cpukit/rtems/src/semcreate.c           |  2 +-
 cpukit/rtems/src/semdelete.c           |  4 ++--
 cpukit/rtems/src/semobtain.c           | 24 ++++++++++++------------
 cpukit/rtems/src/semrelease.c          | 18 +++++++++---------
 cpukit/rtems/src/semsetpriority.c      |  2 +-
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/cpukit/libmisc/monitor/mon-sema.c b/cpukit/libmisc/monitor/mon-sema.c
index d7a7aafc9c..3ec5e374a8 100644
--- a/cpukit/libmisc/monitor/mon-sema.c
+++ b/cpukit/libmisc/monitor/mon-sema.c
@@ -82,7 +82,7 @@ rtems_monitor_sema_canonical(
 #if defined(RTEMS_SMP)
       case SEMAPHORE_VARIANT_MRSP:
         canonical_sema->cur_count =
-          rtems_sema->Core_control.mrsp.Resource.owner == NULL;
+          rtems_sema->Core_control.MRSP.Resource.owner == NULL;
         canonical_sema->max_count = 1;
         break;
 #endif
diff --git a/cpukit/rtems/include/rtems/rtems/sem.h b/cpukit/rtems/include/rtems/rtems/sem.h
index 725d9999e5..bf92986a3a 100644
--- a/cpukit/rtems/include/rtems/rtems/sem.h
+++ b/cpukit/rtems/include/rtems/rtems/sem.h
@@ -92,7 +92,7 @@ typedef struct {
     CORE_semaphore_Control semaphore;
 
 #if defined(RTEMS_SMP)
-    MRSP_Control mrsp;
+    MRSP_Control MRSP;
 #endif
   } Core_control;
 
diff --git a/cpukit/rtems/src/semcreate.c b/cpukit/rtems/src/semcreate.c
index 943d787246..be72874e59 100644
--- a/cpukit/rtems/src/semcreate.c
+++ b/cpukit/rtems/src/semcreate.c
@@ -162,7 +162,7 @@ rtems_status_code rtems_semaphore_create(
   } else if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) ) {
     the_semaphore->variant = SEMAPHORE_VARIANT_MRSP;
     status = _MRSP_Initialize(
-      &the_semaphore->Core_control.mrsp,
+      &the_semaphore->Core_control.MRSP,
       priority_ceiling,
       executing,
       count != 1
diff --git a/cpukit/rtems/src/semdelete.c b/cpukit/rtems/src/semdelete.c
index db8c8008e5..fa0c25af27 100644
--- a/cpukit/rtems/src/semdelete.c
+++ b/cpukit/rtems/src/semdelete.c
@@ -66,7 +66,7 @@ rtems_status_code rtems_semaphore_delete(
       break;
 #if defined(RTEMS_SMP)
     case SEMAPHORE_VARIANT_MRSP:
-      status = _MRSP_Can_destroy( &the_semaphore->Core_control.mrsp );
+      status = _MRSP_Can_destroy( &the_semaphore->Core_control.MRSP );
       break;
 #endif
     default:
@@ -92,7 +92,7 @@ rtems_status_code rtems_semaphore_delete(
   switch ( the_semaphore->variant ) {
 #if defined(RTEMS_SMP)
     case SEMAPHORE_VARIANT_MRSP:
-      _MRSP_Destroy( &the_semaphore->Core_control.mrsp, &queue_context );
+      _MRSP_Destroy( &the_semaphore->Core_control.MRSP, &queue_context );
       break;
 #endif
     default:
diff --git a/cpukit/rtems/src/semobtain.c b/cpukit/rtems/src/semobtain.c
index 80bb199dc2..4e8b5f3b17 100644
--- a/cpukit/rtems/src/semobtain.c
+++ b/cpukit/rtems/src/semobtain.c
@@ -40,7 +40,7 @@ THREAD_QUEUE_OBJECT_ASSERT(
 #if defined(RTEMS_SMP)
 THREAD_QUEUE_OBJECT_ASSERT(
   Semaphore_Control,
-  Core_control.mrsp.Wait_queue
+  Core_control.MRSP.Wait_queue
 );
 #endif
 
@@ -70,17 +70,6 @@ rtems_status_code rtems_semaphore_obtain(
   wait = !_Options_Is_no_wait( option_set );
 
   switch ( the_semaphore->variant ) {
-#if defined(RTEMS_SMP)
-    case SEMAPHORE_VARIANT_MRSP:
-      status = _MRSP_Seize(
-        &the_semaphore->Core_control.mrsp,
-        executing,
-        wait,
-        timeout,
-        &queue_context
-      );
-      break;
-#endif
     case SEMAPHORE_VARIANT_MUTEX_INHERIT_PRIORITY:
       status = _CORE_recursive_mutex_Seize(
         &the_semaphore->Core_control.Mutex.Recursive,
@@ -112,6 +101,17 @@ rtems_status_code rtems_semaphore_obtain(
         &queue_context
       );
       break;
+#if defined(RTEMS_SMP)
+    case SEMAPHORE_VARIANT_MRSP:
+      status = _MRSP_Seize(
+        &the_semaphore->Core_control.MRSP,
+        executing,
+        wait,
+        timeout,
+        &queue_context
+      );
+      break;
+#endif
     default:
       _Assert(
         the_semaphore->variant == SEMAPHORE_VARIANT_SIMPLE_BINARY
diff --git a/cpukit/rtems/src/semrelease.c b/cpukit/rtems/src/semrelease.c
index 0808a2a475..3d8a7233f7 100644
--- a/cpukit/rtems/src/semrelease.c
+++ b/cpukit/rtems/src/semrelease.c
@@ -49,15 +49,6 @@ rtems_status_code rtems_semaphore_release( rtems_id id )
   );
 
   switch ( the_semaphore->variant ) {
-#if defined(RTEMS_SMP)
-    case SEMAPHORE_VARIANT_MRSP:
-      status = _MRSP_Surrender(
-        &the_semaphore->Core_control.mrsp,
-        executing,
-        &queue_context
-      );
-      break;
-#endif
     case SEMAPHORE_VARIANT_MUTEX_INHERIT_PRIORITY:
       status = _CORE_recursive_mutex_Surrender(
         &the_semaphore->Core_control.Mutex.Recursive,
@@ -93,6 +84,15 @@ rtems_status_code rtems_semaphore_release( rtems_id id )
       );
       status = STATUS_SUCCESSFUL;
       break;
+#if defined(RTEMS_SMP)
+    case SEMAPHORE_VARIANT_MRSP:
+      status = _MRSP_Surrender(
+        &the_semaphore->Core_control.MRSP,
+        executing,
+        &queue_context
+      );
+      break;
+#endif
     default:
       _Assert( the_semaphore->variant == SEMAPHORE_VARIANT_COUNTING );
       status = _CORE_semaphore_Surrender(
diff --git a/cpukit/rtems/src/semsetpriority.c b/cpukit/rtems/src/semsetpriority.c
index 14aa34eae4..455cc15717 100644
--- a/cpukit/rtems/src/semsetpriority.c
+++ b/cpukit/rtems/src/semsetpriority.c
@@ -58,7 +58,7 @@ static rtems_status_code _Semaphore_Set_priority(
       break;
 #if defined(RTEMS_SMP)
     case SEMAPHORE_VARIANT_MRSP:
-      mrsp = &the_semaphore->Core_control.mrsp;
+      mrsp = &the_semaphore->Core_control.MRSP;
       scheduler_index = _Scheduler_Get_index_by_id( scheduler_id );
 
       _MRSP_Acquire_critical( mrsp, queue_context );
-- 
cgit v1.2.3