summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-12-21 15:23:01 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-12-21 15:23:01 +0000
commit5881d06cb9c85312b996a684bf03a2d72d2d505f (patch)
tree6fd33e34d226d7c118917f76b93a9893a1b0d08e
parentnewlib-1.15.0-rtems4.8-20071221.diff (diff)
downloadrtems-5881d06cb9c85312b996a684bf03a2d72d2d505f.tar.bz2
2007-12-21 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1268/cpukit * libcsupport/include/rtems/assoc.h, rtems/src/semtranslatereturncode.c: There is no rtems_assoc_ptr_by_value method.
-rw-r--r--cpukit/ChangeLog7
-rw-r--r--cpukit/libcsupport/include/rtems/assoc.h13
-rw-r--r--cpukit/rtems/src/semtranslatereturncode.c2
3 files changed, 13 insertions, 9 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 4729c5303d..8175729ed4 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-21 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ PR 1268/cpukit
+ * libcsupport/include/rtems/assoc.h,
+ rtems/src/semtranslatereturncode.c: There is no
+ rtems_assoc_ptr_by_value method.
+
2007-12-16 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Revert Joel's 2007-06-13 NDEBUG patch.
diff --git a/cpukit/libcsupport/include/rtems/assoc.h b/cpukit/libcsupport/include/rtems/assoc.h
index 9cf343fc27..7fe7a23301 100644
--- a/cpukit/libcsupport/include/rtems/assoc.h
+++ b/cpukit/libcsupport/include/rtems/assoc.h
@@ -15,7 +15,7 @@
#define _RTEMS_RTEMS_ASSOC_H
typedef struct {
- const char *name;
+ const char *name;
uint32_t local_value;
uint32_t remote_value;
} rtems_assoc_t;
@@ -31,11 +31,6 @@ const rtems_assoc_t *rtems_assoc_ptr_by_name(
const char *
);
-const rtems_assoc_t *rtems_assoc_ptr_by_value(
- const rtems_assoc_t *,
- uint32_t
-);
-
const rtems_assoc_t *rtems_assoc_ptr_by_remote(
const rtems_assoc_t *,
uint32_t
@@ -53,10 +48,12 @@ uint32_t rtems_assoc_local_by_remote(
uint32_t rtems_assoc_remote_by_name(
const rtems_assoc_t *,
- const char *);
+ const char *
+);
uint32_t rtems_assoc_local_by_name(
const rtems_assoc_t *,
- const char *);
+ const char *
+);
const char *rtems_assoc_name_by_local(
const rtems_assoc_t *,
diff --git a/cpukit/rtems/src/semtranslatereturncode.c b/cpukit/rtems/src/semtranslatereturncode.c
index d7d2d306ac..123f289cac 100644
--- a/cpukit/rtems/src/semtranslatereturncode.c
+++ b/cpukit/rtems/src/semtranslatereturncode.c
@@ -114,7 +114,7 @@ rtems_status_code _Semaphore_Translate_core_semaphore_return_code (
if ( status == THREAD_STATUS_PROXY_BLOCKING )
return RTEMS_PROXY_BLOCKING;
#endif
- if ( status > CORE_MUTEX_STATUS_CEILING_VIOLATED )
+ if ( status > CORE_SEMAPHORE_BAD_TIMEOUT_VALUE )
return RTEMS_INTERNAL_ERROR;
return _Semaphore_Translate_core_semaphore_return_code_[status];
}