rtems: _Semaphore_Get_interrupt_disable()

Use _Objects_Get_local() for _Semaphore_Get_interrupt_disable() to get
rid of the location parameter.  Move remote object handling to semaphore
MPCI support.

1 files changed, 43 insertions, 62 deletions

diff --git a/cpukit/rtems/src/semflush.c b/cpukit/rtems/src/semflush.c
index 13dcf22785..3b1cdb549d 100644
--- a/cpukit/rtems/src/semflush.c
+++ b/cpukit/rtems/src/semflush.c
@@ -18,77 +18,58 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/support.h>
-#include <rtems/rtems/attrimpl.h>
-#include <rtems/score/isr.h>
-#include <rtems/rtems/options.h>
 #include <rtems/rtems/semimpl.h>
-#include <rtems/score/coremuteximpl.h>
-#include <rtems/score/coresemimpl.h>
-#include <rtems/score/thread.h>
-
-#include <rtems/score/interr.h>
+#include <rtems/rtems/attrimpl.h>
 
-rtems_status_code rtems_semaphore_flush(
-  rtems_id        id
-)
+rtems_status_code rtems_semaphore_flush( rtems_id id )
 {
-  Semaphore_Control          *the_semaphore;
-  Objects_Locations           location;
-  ISR_lock_Context            lock_context;
-  rtems_attribute             attribute_set;
+  Semaphore_Control *the_semaphore;
+  ISR_lock_Context   lock_context;
+  rtems_attribute    attribute_set;
 
-  the_semaphore = _Semaphore_Get_interrupt_disable(
-    id,
-    &location,
-    &lock_context
-  );
-  switch ( location ) {
-
-    case OBJECTS_LOCAL:
-      attribute_set = the_semaphore->attribute_set;
-#if defined(RTEMS_SMP)
-      if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) ) {
-        _ISR_lock_ISR_enable( &lock_context );
-        return RTEMS_NOT_DEFINED;
-      } else
-#endif
-      if ( !_Attributes_Is_counting_semaphore( attribute_set ) ) {
-        _CORE_mutex_Acquire_critical(
-          &the_semaphore->Core_control.mutex,
-          &lock_context
-        );
-        _CORE_mutex_Flush(
-          &the_semaphore->Core_control.mutex,
-          _CORE_mutex_Unsatisfied_nowait,
-          _Semaphore_MP_Send_object_was_deleted,
-          id,
-          &lock_context
-        );
-      } else {
-        _CORE_semaphore_Acquire_critical(
-          &the_semaphore->Core_control.semaphore,
-          &lock_context
-        );
-        _CORE_semaphore_Flush(
-          &the_semaphore->Core_control.semaphore,
-          _Semaphore_MP_Send_object_was_deleted,
-          id,
-          &lock_context
-        );
-      }
-      return RTEMS_SUCCESSFUL;
+  the_semaphore = _Semaphore_Get_interrupt_disable( id, &lock_context );
 
+  if ( the_semaphore == NULL ) {
 #if defined(RTEMS_MULTIPROCESSING)
-    case OBJECTS_REMOTE:
+    if ( _Semaphore_MP_Is_remote( id ) ) {
       return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
+    }
 #endif
 
-    case OBJECTS_ERROR:
-      break;
+    return RTEMS_INVALID_ID;
   }
 
-  return RTEMS_INVALID_ID;
+  attribute_set = the_semaphore->attribute_set;
+
+#if defined(RTEMS_SMP)
+  if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) ) {
+    _ISR_lock_ISR_enable( &lock_context );
+    return RTEMS_NOT_DEFINED;
+  } else
+#endif
+  if ( !_Attributes_Is_counting_semaphore( attribute_set ) ) {
+    _CORE_mutex_Acquire_critical(
+      &the_semaphore->Core_control.mutex,
+      &lock_context
+    );
+    _CORE_mutex_Flush(
+      &the_semaphore->Core_control.mutex,
+      _CORE_mutex_Unsatisfied_nowait,
+      _Semaphore_MP_Send_object_was_deleted,
+      id,
+      &lock_context
+    );
+  } else {
+    _CORE_semaphore_Acquire_critical(
+      &the_semaphore->Core_control.semaphore,
+      &lock_context
+    );
+    _CORE_semaphore_Flush(
+      &the_semaphore->Core_control.semaphore,
+      _Semaphore_MP_Send_object_was_deleted,
+      id,
+      &lock_context
+    );
+  }
+  return RTEMS_SUCCESSFUL;
 }