summaryrefslogtreecommitdiffstats
path: root/cpukit/rtems/src/semobtain.c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-23 13:37:59 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-26 21:44:31 +0200
commitdce487912d98835b8168e755b60514f5a8592b27 (patch)
tree8778547fbb0f2dbb07bb6a83f28d3f4464924141 /cpukit/rtems/src/semobtain.c
parentposix: Fix sem_init() with too large initial value (diff)
downloadrtems-dce487912d98835b8168e755b60514f5a8592b27.tar.bz2
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.
Diffstat (limited to 'cpukit/rtems/src/semobtain.c')
-rw-r--r--cpukit/rtems/src/semobtain.c31
1 files changed, 13 insertions, 18 deletions
diff --git a/cpukit/rtems/src/semobtain.c b/cpukit/rtems/src/semobtain.c
index 6d994f4707..527f7ea03f 100644
--- a/cpukit/rtems/src/semobtain.c
+++ b/cpukit/rtems/src/semobtain.c
@@ -21,6 +21,7 @@
#include <rtems/rtems/semimpl.h>
#include <rtems/rtems/attrimpl.h>
#include <rtems/rtems/optionsimpl.h>
+#include <rtems/rtems/statusimpl.h>
THREAD_QUEUE_OBJECT_ASSERT(
Semaphore_Control,
@@ -43,6 +44,7 @@ rtems_status_code rtems_semaphore_obtain(
Thread_Control *executing;
rtems_attribute attribute_set;
bool wait;
+ Status_Control status;
the_semaphore = _Semaphore_Get( id, &queue_context, NULL );
@@ -59,40 +61,33 @@ rtems_status_code rtems_semaphore_obtain(
wait = !_Options_Is_no_wait( option_set );
#if defined(RTEMS_SMP)
if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) ) {
- MRSP_Status mrsp_status;
-
- mrsp_status = _MRSP_Seize(
+ status = _MRSP_Seize(
&the_semaphore->Core_control.mrsp,
executing,
wait,
timeout,
&queue_context
);
- return _Semaphore_Translate_MRSP_status_code( mrsp_status );
} else
#endif
if ( !_Attributes_Is_counting_semaphore( attribute_set ) ) {
- _CORE_mutex_Seize(
+ status = _CORE_mutex_Seize(
&the_semaphore->Core_control.mutex,
executing,
wait,
timeout,
&queue_context
);
- return _Semaphore_Translate_core_mutex_return_code(
- executing->Wait.return_code
+ } else {
+ /* must be a counting semaphore */
+ status = _CORE_semaphore_Seize(
+ &the_semaphore->Core_control.semaphore,
+ executing,
+ wait,
+ timeout,
+ &queue_context
);
}
- /* must be a counting semaphore */
- _CORE_semaphore_Seize(
- &the_semaphore->Core_control.semaphore,
- executing,
- wait,
- timeout,
- &queue_context
- );
- return _Semaphore_Translate_core_semaphore_return_code(
- executing->Wait.return_code
- );
+ return _Status_Get( status );
}