diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-23 13:37:59 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-26 21:44:31 +0200 |
| commit | dce487912d98835b8168e755b60514f5a8592b27 (patch) | |
| tree | 8778547fbb0f2dbb07bb6a83f28d3f4464924141 /cpukit/rtems/src/semcreate.c | |
| parent | posix: Fix sem_init() with too large initial value (diff) | |
| download | rtems-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/semcreate.c')
| -rw-r--r-- | cpukit/rtems/src/semcreate.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/cpukit/rtems/src/semcreate.c b/cpukit/rtems/src/semcreate.c index d2895465b7..83d46b607e 100644 --- a/cpukit/rtems/src/semcreate.c +++ b/cpukit/rtems/src/semcreate.c @@ -25,6 +25,7 @@ #include <rtems/score/isr.h> #include <rtems/rtems/options.h> #include <rtems/rtems/semimpl.h> +#include <rtems/rtems/statusimpl.h> #include <rtems/rtems/tasksimpl.h> #include <rtems/score/coremuteximpl.h> #include <rtems/score/coresemimpl.h> @@ -63,7 +64,7 @@ rtems_status_code rtems_semaphore_create( Semaphore_Control *the_semaphore; CORE_mutex_Attributes the_mutex_attr; CORE_semaphore_Disciplines semaphore_discipline; - CORE_mutex_Status mutex_status; + Status_Control status; if ( !rtems_is_name_valid( name ) ) return RTEMS_INVALID_NAME; @@ -155,21 +156,15 @@ rtems_status_code rtems_semaphore_create( semaphore_discipline, count ); + status = STATUS_SUCCESSFUL; #if defined(RTEMS_SMP) } else if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) ) { - MRSP_Status mrsp_status = _MRSP_Initialize( + status = _MRSP_Initialize( &the_semaphore->Core_control.mrsp, priority_ceiling, _Thread_Get_executing(), count != 1 ); - - if ( mrsp_status != MRSP_SUCCESSFUL ) { - _Semaphore_Free( the_semaphore ); - _Objects_Allocator_unlock(); - - return _Semaphore_Translate_MRSP_status_code( mrsp_status ); - } #endif } else { /* @@ -202,18 +197,18 @@ rtems_status_code rtems_semaphore_create( the_mutex_attr.only_owner_release = false; } - mutex_status = _CORE_mutex_Initialize( + status = _CORE_mutex_Initialize( &the_semaphore->Core_control.mutex, _Thread_Get_executing(), &the_mutex_attr, count != 1 ); + } - if ( mutex_status == CORE_MUTEX_STATUS_CEILING_VIOLATED ) { - _Semaphore_Free( the_semaphore ); - _Objects_Allocator_unlock(); - return RTEMS_INVALID_PRIORITY; - } + if ( status != STATUS_SUCCESSFUL ) { + _Semaphore_Free( the_semaphore ); + _Objects_Allocator_unlock(); + return _Status_Get( status ); } /* |