From dce487912d98835b8168e755b60514f5a8592b27 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 23 May 2016 13:37:59 +0200
Subject: score: Add Status_Control for all APIs

Unify the status codes of the Classic and POSIX API to use the new enum
Status_Control.  This eliminates the Thread_Control::Wait::timeout_code
field and the timeout parameter of _Thread_queue_Enqueue_critical() and
_MPCI_Send_request_packet().  It gets rid of the status code translation
tables and instead uses simple bit operations to get the status for a
particular API.  This enables translation of status code constants at
compile time.  Add _Thread_Wait_get_status() to avoid direct access of
thread internal data structures.
---
 cpukit/score/src/coremsgseize.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'cpukit/score/src/coremsgseize.c')

diff --git a/cpukit/score/src/coremsgseize.c b/cpukit/score/src/coremsgseize.c
index b05ddd63f3..00ff437e01 100644
--- a/cpukit/score/src/coremsgseize.c
+++ b/cpukit/score/src/coremsgseize.c
@@ -22,10 +22,10 @@
 #include <rtems/score/chain.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/coremsgimpl.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threadimpl.h>
 #include <rtems/score/statesimpl.h>
 
-void _CORE_message_queue_Seize(
+Status_Control _CORE_message_queue_Seize(
   CORE_message_queue_Control *the_message_queue,
   Thread_Control             *executing,
   void                       *buffer,
@@ -37,7 +37,6 @@ void _CORE_message_queue_Seize(
 {
   CORE_message_queue_Buffer_control *the_message;
 
-  executing->Wait.return_code = CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL;
   the_message = _CORE_message_queue_Get_pending_message( the_message_queue );
   if ( the_message != NULL ) {
     the_message_queue->number_of_pending_messages -= 1;
@@ -58,7 +57,7 @@ void _CORE_message_queue_Seize(
        */
       _CORE_message_queue_Free_message_buffer(the_message_queue, the_message);
       _CORE_message_queue_Release( the_message_queue, queue_context );
-      return;
+      return STATUS_SUCCESSFUL;
     #else
     {
       Thread_Control   *the_thread;
@@ -80,7 +79,7 @@ void _CORE_message_queue_Seize(
           the_message
         );
         _CORE_message_queue_Release( the_message_queue, queue_context );
-        return;
+        return STATUS_SUCCESSFUL;
       }
 
       /*
@@ -101,15 +100,14 @@ void _CORE_message_queue_Seize(
         the_thread,
         queue_context
       );
-      return;
+      return STATUS_SUCCESSFUL;
     }
     #endif
   }
 
   if ( !wait ) {
     _CORE_message_queue_Release( the_message_queue, queue_context );
-    executing->Wait.return_code = CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED_NOWAIT;
-    return;
+    return STATUS_UNSATISFIED;
   }
 
   executing->Wait.return_argument_second.mutable_object = buffer;
@@ -122,7 +120,7 @@ void _CORE_message_queue_Seize(
     executing,
     STATES_WAITING_FOR_MESSAGE,
     timeout,
-    CORE_MESSAGE_QUEUE_STATUS_TIMEOUT,
     &queue_context->Lock_context
   );
+  return _Thread_Wait_get_status( executing );
 }
-- 
cgit v1.2.3