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/score/src/mutex.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/score/src/mutex.c')
| -rw-r--r-- | cpukit/score/src/mutex.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cpukit/score/src/mutex.c b/cpukit/score/src/mutex.c index 0b12232145..28936d6bfc 100644 --- a/cpukit/score/src/mutex.c +++ b/cpukit/score/src/mutex.c @@ -119,7 +119,6 @@ static void _Mutex_Acquire_slow( executing, STATES_WAITING_FOR_SYS_LOCK_MUTEX, timeout, - ETIMEDOUT, lock_context ); } @@ -262,10 +261,9 @@ int _Mutex_Acquire_timed( break; } - executing->Wait.return_code = 0; _Mutex_Acquire_slow( mutex, owner, executing, ticks, &lock_context ); - return (int) executing->Wait.return_code; + return STATUS_GET_POSIX( _Thread_Wait_get_status( executing ) ); } } @@ -382,7 +380,6 @@ int _Mutex_recursive_Acquire_timed( break; } - executing->Wait.return_code = 0; _Mutex_Acquire_slow( &mutex->Mutex, owner, @@ -391,7 +388,7 @@ int _Mutex_recursive_Acquire_timed( &lock_context ); - return (int) executing->Wait.return_code; + return STATUS_GET_POSIX( _Thread_Wait_get_status( executing ) ); } } |