diff options
Diffstat (limited to 'cpukit/rtems')
| -rw-r--r-- | cpukit/rtems/src/msgqcreate.c | 14 | ||||
| -rw-r--r-- | cpukit/rtems/src/msgqreceive.c | 6 | ||||
| -rw-r--r-- | cpukit/rtems/src/msgqsubmit.c | 41 |
3 files changed, 31 insertions, 30 deletions
diff --git a/cpukit/rtems/src/msgqcreate.c b/cpukit/rtems/src/msgqcreate.c index 395cbf3a02..24bc35993d 100644 --- a/cpukit/rtems/src/msgqcreate.c +++ b/cpukit/rtems/src/msgqcreate.c @@ -59,7 +59,7 @@ rtems_status_code rtems_message_queue_create( ) { register Message_queue_Control *the_message_queue; - CORE_message_queue_Attributes the_message_queue_attributes; + CORE_message_queue_Attributes the_msgq_attributes; void *handler; #if defined(RTEMS_MULTIPROCESSING) boolean is_global; @@ -74,10 +74,10 @@ rtems_status_code rtems_message_queue_create( return RTEMS_MP_NOT_CONFIGURED; #endif - if (count == 0) + if ( count == 0 ) return RTEMS_INVALID_NUMBER; - if (max_message_size == 0) + if ( max_message_size == 0 ) return RTEMS_INVALID_SIZE; #if defined(RTEMS_MULTIPROCESSING) @@ -115,11 +115,9 @@ rtems_status_code rtems_message_queue_create( the_message_queue->attribute_set = attribute_set; if (_Attributes_Is_priority( attribute_set ) ) - the_message_queue_attributes.discipline = - CORE_MESSAGE_QUEUE_DISCIPLINES_PRIORITY; + the_msgq_attributes.discipline = CORE_MESSAGE_QUEUE_DISCIPLINES_PRIORITY; else - the_message_queue_attributes.discipline = - CORE_MESSAGE_QUEUE_DISCIPLINES_FIFO; + the_msgq_attributes.discipline = CORE_MESSAGE_QUEUE_DISCIPLINES_FIFO; handler = NULL; #if defined(RTEMS_MULTIPROCESSING) @@ -129,7 +127,7 @@ rtems_status_code rtems_message_queue_create( if ( ! _CORE_message_queue_Initialize( &the_message_queue->message_queue, OBJECTS_RTEMS_MESSAGE_QUEUES, - &the_message_queue_attributes, + &the_msgq_attributes, count, max_message_size, handler ) ) { diff --git a/cpukit/rtems/src/msgqreceive.c b/cpukit/rtems/src/msgqreceive.c index 1338216c6b..77fcadc313 100644 --- a/cpukit/rtems/src/msgqreceive.c +++ b/cpukit/rtems/src/msgqreceive.c @@ -92,12 +92,12 @@ rtems_status_code rtems_message_queue_receive( buffer, size, wait, - &core_priority, timeout ); _Thread_Enable_dispatch(); - return( _Message_queue_Translate_core_message_queue_return_code( - _Thread_Executing->Wait.return_code ) ); + return _Message_queue_Translate_core_message_queue_return_code( + _Thread_Executing->Wait.return_code + ); } diff --git a/cpukit/rtems/src/msgqsubmit.c b/cpukit/rtems/src/msgqsubmit.c index 5a03f6409a..16f1c50266 100644 --- a/cpukit/rtems/src/msgqsubmit.c +++ b/cpukit/rtems/src/msgqsubmit.c @@ -61,7 +61,6 @@ rtems_status_code _Message_queue_Submit( { register Message_queue_Control *the_message_queue; Objects_Locations location; - CORE_message_queue_Status core_status; the_message_queue = _Message_queue_Get( id, &location ); switch ( location ) @@ -98,39 +97,43 @@ rtems_status_code _Message_queue_Submit( case OBJECTS_LOCAL: switch ( submit_type ) { case MESSAGE_QUEUE_SEND_REQUEST: - core_status = _CORE_message_queue_Send( - &the_message_queue->message_queue, - buffer, - size, - id, + _CORE_message_queue_Send( + &the_message_queue->message_queue, + buffer, + size, + id, #if defined(RTEMS_MULTIPROCESSING) - _Message_queue_Core_message_queue_mp_support + _Message_queue_Core_message_queue_mp_support, #else - NULL + NULL, #endif - ); + FALSE, /* sender does not block */ + 0 /* no timeout */ + ); break; case MESSAGE_QUEUE_URGENT_REQUEST: - core_status = _CORE_message_queue_Urgent( - &the_message_queue->message_queue, - buffer, - size, - id, + _CORE_message_queue_Urgent( + &the_message_queue->message_queue, + buffer, + size, + id, #if defined(RTEMS_MULTIPROCESSING) - _Message_queue_Core_message_queue_mp_support + _Message_queue_Core_message_queue_mp_support, #else - NULL + NULL, #endif - ); + FALSE, /* sender does not block */ + 0 /* no timeout */ + ); break; default: - core_status = CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL; return RTEMS_INTERNAL_ERROR; /* should never get here */ } _Thread_Enable_dispatch(); return _Message_queue_Translate_core_message_queue_return_code( - core_status ); + _Thread_Executing->Wait.return_code + ); } return RTEMS_INTERNAL_ERROR; /* unreached - only to remove warnings */ |