From 73f2ddb9157ba04531e0a825a8532a280e6a05e5 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 30 May 2016 10:43:31 +0200
Subject: rtems: Fix semaphore field name

---
 cpukit/libmisc/monitor/mon-sema.c          | 4 ++--
 cpukit/rtems/include/rtems/rtems/sem.h     | 2 +-
 cpukit/rtems/src/semcreate.c               | 4 ++--
 cpukit/rtems/src/semobtain.c               | 4 ++--
 cpukit/rtems/src/semrelease.c              | 4 ++--
 testsuites/sptests/spintrcritical22/init.c | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cpukit/libmisc/monitor/mon-sema.c b/cpukit/libmisc/monitor/mon-sema.c
index 3ec5e374a8..272391f01e 100644
--- a/cpukit/libmisc/monitor/mon-sema.c
+++ b/cpukit/libmisc/monitor/mon-sema.c
@@ -87,11 +87,11 @@ rtems_monitor_sema_canonical(
         break;
 #endif
       case SEMAPHORE_VARIANT_SIMPLE_BINARY:
-        canonical_sema->cur_count = rtems_sema->Core_control.semaphore.count;
+        canonical_sema->cur_count = rtems_sema->Core_control.Semaphore.count;
         canonical_sema->max_count = 1;
         break;
       case SEMAPHORE_VARIANT_COUNTING:
-        canonical_sema->cur_count = rtems_sema->Core_control.semaphore.count;
+        canonical_sema->cur_count = rtems_sema->Core_control.Semaphore.count;
         canonical_sema->max_count = UINT32_MAX;
         break;
     }
diff --git a/cpukit/rtems/include/rtems/rtems/sem.h b/cpukit/rtems/include/rtems/rtems/sem.h
index bf92986a3a..41b0061979 100644
--- a/cpukit/rtems/include/rtems/rtems/sem.h
+++ b/cpukit/rtems/include/rtems/rtems/sem.h
@@ -89,7 +89,7 @@ typedef struct {
      *  This is the SuperCore Semaphore instance associated with this Classic
      *  API Semaphore instance.
      */
-    CORE_semaphore_Control semaphore;
+    CORE_semaphore_Control Semaphore;
 
 #if defined(RTEMS_SMP)
     MRSP_Control MRSP;
diff --git a/cpukit/rtems/src/semcreate.c b/cpukit/rtems/src/semcreate.c
index be72874e59..b65a442694 100644
--- a/cpukit/rtems/src/semcreate.c
+++ b/cpukit/rtems/src/semcreate.c
@@ -147,14 +147,14 @@ rtems_status_code rtems_semaphore_create(
   if ( _Attributes_Is_counting_semaphore( attribute_set ) ) {
     the_semaphore->variant = SEMAPHORE_VARIANT_COUNTING;
     _CORE_semaphore_Initialize(
-      &the_semaphore->Core_control.semaphore,
+      &the_semaphore->Core_control.Semaphore,
       count
     );
     status = STATUS_SUCCESSFUL;
   } else if ( _Attributes_Is_simple_binary_semaphore( attribute_set ) ) {
     the_semaphore->variant = SEMAPHORE_VARIANT_SIMPLE_BINARY;
     _CORE_semaphore_Initialize(
-      &the_semaphore->Core_control.semaphore,
+      &the_semaphore->Core_control.Semaphore,
       count != 0
     );
     status = STATUS_SUCCESSFUL;
diff --git a/cpukit/rtems/src/semobtain.c b/cpukit/rtems/src/semobtain.c
index 4e8b5f3b17..0e5330af41 100644
--- a/cpukit/rtems/src/semobtain.c
+++ b/cpukit/rtems/src/semobtain.c
@@ -34,7 +34,7 @@ THREAD_QUEUE_OBJECT_ASSERT(
 
 THREAD_QUEUE_OBJECT_ASSERT(
   Semaphore_Control,
-  Core_control.semaphore.Wait_queue
+  Core_control.Semaphore.Wait_queue
 );
 
 #if defined(RTEMS_SMP)
@@ -118,7 +118,7 @@ rtems_status_code rtems_semaphore_obtain(
           || the_semaphore->variant == SEMAPHORE_VARIANT_COUNTING
       );
       status = _CORE_semaphore_Seize(
-        &the_semaphore->Core_control.semaphore,
+        &the_semaphore->Core_control.Semaphore,
         _Semaphore_Get_operations( the_semaphore ),
         executing,
         wait,
diff --git a/cpukit/rtems/src/semrelease.c b/cpukit/rtems/src/semrelease.c
index 3d8a7233f7..ccd4e63d64 100644
--- a/cpukit/rtems/src/semrelease.c
+++ b/cpukit/rtems/src/semrelease.c
@@ -73,7 +73,7 @@ rtems_status_code rtems_semaphore_release( rtems_id id )
       break;
     case SEMAPHORE_VARIANT_SIMPLE_BINARY:
       status = _CORE_semaphore_Surrender(
-        &the_semaphore->Core_control.semaphore,
+        &the_semaphore->Core_control.Semaphore,
         _Semaphore_Get_operations( the_semaphore ),
         1,
         &queue_context
@@ -96,7 +96,7 @@ rtems_status_code rtems_semaphore_release( rtems_id id )
     default:
       _Assert( the_semaphore->variant == SEMAPHORE_VARIANT_COUNTING );
       status = _CORE_semaphore_Surrender(
-        &the_semaphore->Core_control.semaphore,
+        &the_semaphore->Core_control.Semaphore,
         _Semaphore_Get_operations( the_semaphore ),
         UINT32_MAX,
         &queue_context
diff --git a/testsuites/sptests/spintrcritical22/init.c b/testsuites/sptests/spintrcritical22/init.c
index 6c8198b293..56d7837821 100644
--- a/testsuites/sptests/spintrcritical22/init.c
+++ b/testsuites/sptests/spintrcritical22/init.c
@@ -64,7 +64,7 @@ static void release_semaphore(rtems_id timer, void *arg)
       _Thread_Wait_flags_get(ctx->main_task_control)
         == (THREAD_WAIT_CLASS_OBJECT | THREAD_WAIT_STATE_READY_AGAIN)
     );
-    sem = &ctx->semaphore_control->Core_control.semaphore;
+    sem = &ctx->semaphore_control->Core_control.Semaphore;
     rtems_test_assert(sem->count == 0);
   } else {
     sc = rtems_semaphore_release(ctx->semaphore_id);
-- 
cgit v1.2.3