summaryrefslogtreecommitdiffstats
path: root/cpukit/rtems/src/semtranslatereturncode.c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2006-10-30 22:21:23 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2006-10-30 22:21:23 +0000
commit0c2ec7f52c496e436f09d44dcb880bf4ea16ba86 (patch)
treea9b300a256bb640e1abfdc6dbbb6eac0a49c6a96 /cpukit/rtems/src/semtranslatereturncode.c
parent2006-10-30 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-0c2ec7f52c496e436f09d44dcb880bf4ea16ba86.tar.bz2
2006-10-30 Joel Sherrill <joel@OARcorp.com>
PR 841/rtems * itron/inline/rtems/itron/semaphore.inl, itron/src/twai_sem.c, posix/include/rtems/posix/semaphore.h, posix/inline/rtems/posix/semaphore.inl, posix/src/semaphorewaitsupp.c, posix/src/semtimedwait.c, posix/src/semwait.c, rtems/src/semobtain.c, rtems/src/semtranslatereturncode.c, score/include/rtems/score/coresem.h, score/src/coresemseize.c: Make sem_timedwait more conformant to Open Group specification.
Diffstat (limited to 'cpukit/rtems/src/semtranslatereturncode.c')
-rw-r--r--cpukit/rtems/src/semtranslatereturncode.c26
1 files changed, 11 insertions, 15 deletions
diff --git a/cpukit/rtems/src/semtranslatereturncode.c b/cpukit/rtems/src/semtranslatereturncode.c
index cc7bfffbd6..d7d2d306ac 100644
--- a/cpukit/rtems/src/semtranslatereturncode.c
+++ b/cpukit/rtems/src/semtranslatereturncode.c
@@ -54,7 +54,7 @@
* _Semaphore_Translate_core_mutex_return_code
*
* Input parameters:
- * the_mutex_status - mutex status code to translate
+ * status - mutex status code to translate
*
* Output parameters:
* rtems status code - translated RTEMS status code
@@ -73,18 +73,16 @@ rtems_status_code _Semaphore_Translate_core_mutex_return_code_[] = {
rtems_status_code _Semaphore_Translate_core_mutex_return_code (
- uint32_t the_mutex_status
+ uint32_t status
)
{
#if defined(RTEMS_MULTIPROCESSING)
- if ( the_mutex_status == THREAD_STATUS_PROXY_BLOCKING )
+ if ( status == THREAD_STATUS_PROXY_BLOCKING )
return RTEMS_PROXY_BLOCKING;
- else
#endif
- if ( the_mutex_status > CORE_MUTEX_STATUS_CEILING_VIOLATED )
+ if ( status > CORE_MUTEX_STATUS_CEILING_VIOLATED )
return RTEMS_INTERNAL_ERROR;
- else
- return _Semaphore_Translate_core_mutex_return_code_[the_mutex_status];
+ return _Semaphore_Translate_core_mutex_return_code_[status];
}
/*PAGE
@@ -92,7 +90,7 @@ rtems_status_code _Semaphore_Translate_core_mutex_return_code (
* _Semaphore_Translate_core_semaphore_return_code
*
* Input parameters:
- * the_semaphore_status - semaphore status code to translate
+ * status - semaphore status code to translate
*
* Output parameters:
* rtems status code - translated RTEMS status code
@@ -105,20 +103,18 @@ rtems_status_code _Semaphore_Translate_core_semaphore_return_code_[] = {
RTEMS_OBJECT_WAS_DELETED, /* CORE_SEMAPHORE_WAS_DELETED */
RTEMS_TIMEOUT, /* CORE_SEMAPHORE_TIMEOUT */
RTEMS_INTERNAL_ERROR, /* CORE_SEMAPHORE_MAXIMUM_COUNT_EXCEEDED */
-
+ RTEMS_INTERNAL_ERROR /* CORE_SEMAPHORE_BAD_TIMEOUT_VALUE */
};
rtems_status_code _Semaphore_Translate_core_semaphore_return_code (
- uint32_t the_semaphore_status
+ uint32_t status
)
{
#if defined(RTEMS_MULTIPROCESSING)
- if ( the_semaphore_status == THREAD_STATUS_PROXY_BLOCKING )
+ if ( status == THREAD_STATUS_PROXY_BLOCKING )
return RTEMS_PROXY_BLOCKING;
- else
#endif
- if ( the_semaphore_status > CORE_MUTEX_STATUS_CEILING_VIOLATED )
+ if ( status > CORE_MUTEX_STATUS_CEILING_VIOLATED )
return RTEMS_INTERNAL_ERROR;
- else
- return _Semaphore_Translate_core_semaphore_return_code_[the_semaphore_status];
+ return _Semaphore_Translate_core_semaphore_return_code_[status];
}