summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/ChangeLog7
-rw-r--r--cpukit/rtems/src/msgmp.c2
-rw-r--r--cpukit/rtems/src/msgqtranslatereturncode.c2
-rw-r--r--cpukit/rtems/src/semmp.c2
-rw-r--r--cpukit/rtems/src/semtranslatereturncode.c4
5 files changed, 12 insertions, 5 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 20ca000d49..1e273e1c50 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,12 @@
2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * rtems/src/msgmp.c, rtems/src/msgqtranslatereturncode.c,
+ rtems/src/semmp.c, rtems/src/semtranslatereturncode.c: Correct
+ confusion over SuperCore proxy blocking status and Classic API proxy
+ blocking status constants.
+
+2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* score/src/objectgetinfo.c: Correct for multiprocessor systems when
all object instances within a particular class are remote.
diff --git a/cpukit/rtems/src/msgmp.c b/cpukit/rtems/src/msgmp.c
index 1c419947cc..f0e39b34cc 100644
--- a/cpukit/rtems/src/msgmp.c
+++ b/cpukit/rtems/src/msgmp.c
@@ -309,7 +309,7 @@ void _Message_queue_MP_Process_packet (
the_packet->Prefix.timeout
);
- if (! _Thread_Is_proxy_blocking( the_packet->Prefix.return_code ) )
+ if ( the_packet->Prefix.return_code != RTEMS_PROXY_BLOCKING )
_Message_queue_MP_Send_response_packet(
MESSAGE_QUEUE_MP_RECEIVE_RESPONSE,
the_packet->Prefix.id,
diff --git a/cpukit/rtems/src/msgqtranslatereturncode.c b/cpukit/rtems/src/msgqtranslatereturncode.c
index 3e071e7c56..8a554cb7cc 100644
--- a/cpukit/rtems/src/msgqtranslatereturncode.c
+++ b/cpukit/rtems/src/msgqtranslatereturncode.c
@@ -65,7 +65,7 @@ rtems_status_code _Message_queue_Translate_core_message_queue_return_code (
* from the external status codes.
*/
#if defined(RTEMS_MULTIPROCESSING)
- if ( status == THREAD_STATUS_PROXY_BLOCKING )
+ if ( _Thread_Is_proxy_blocking(status) )
return RTEMS_PROXY_BLOCKING;
#endif
diff --git a/cpukit/rtems/src/semmp.c b/cpukit/rtems/src/semmp.c
index c8dc27b11b..f4d96452c5 100644
--- a/cpukit/rtems/src/semmp.c
+++ b/cpukit/rtems/src/semmp.c
@@ -227,7 +227,7 @@ void _Semaphore_MP_Process_packet (
the_packet->Prefix.timeout
);
- if ( ! _Thread_Is_proxy_blocking( the_packet->Prefix.return_code ) )
+ if ( the_packet->Prefix.return_code != RTEMS_PROXY_BLOCKING )
_Semaphore_MP_Send_response_packet(
SEMAPHORE_MP_OBTAIN_RESPONSE,
the_packet->Prefix.id,
diff --git a/cpukit/rtems/src/semtranslatereturncode.c b/cpukit/rtems/src/semtranslatereturncode.c
index 19ee8e7b81..261aaa57de 100644
--- a/cpukit/rtems/src/semtranslatereturncode.c
+++ b/cpukit/rtems/src/semtranslatereturncode.c
@@ -83,7 +83,7 @@ rtems_status_code _Semaphore_Translate_core_mutex_return_code (
* If this thread is blocking waiting for a result on a remote operation.
*/
#if defined(RTEMS_MULTIPROCESSING)
- if ( status == THREAD_STATUS_PROXY_BLOCKING )
+ if ( _Thread_Is_proxy_blocking(status) )
return RTEMS_PROXY_BLOCKING;
#endif
@@ -122,7 +122,7 @@ rtems_status_code _Semaphore_Translate_core_semaphore_return_code (
)
{
#if defined(RTEMS_MULTIPROCESSING)
- if ( status == THREAD_STATUS_PROXY_BLOCKING )
+ if ( _Thread_Is_proxy_blocking(status) )
return RTEMS_PROXY_BLOCKING;
#endif
/*