From 631b3c8967a329cdd53e54365e4e4c0aa93a4251 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 23 May 2016 11:40:18 +0200 Subject: score: Move thread queue MP callout to context Drop the multiprocessing (MP) dependent callout parameter from the thread queue extract, dequeue, flush and unblock methods. Merge this parameter with the lock context into new structure Thread_queue_Context. This helps to gets rid of the conditionally compiled method call helpers. --- cpukit/rtems/src/msgqreceive.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cpukit/rtems/src/msgqreceive.c') diff --git a/cpukit/rtems/src/msgqreceive.c b/cpukit/rtems/src/msgqreceive.c index dada8dff81..6ed3d25674 100644 --- a/cpukit/rtems/src/msgqreceive.c +++ b/cpukit/rtems/src/msgqreceive.c @@ -32,7 +32,7 @@ rtems_status_code rtems_message_queue_receive( ) { Message_queue_Control *the_message_queue; - ISR_lock_Context lock_context; + Thread_queue_Context queue_context; Thread_Control *executing; if ( buffer == NULL ) { @@ -43,7 +43,7 @@ rtems_status_code rtems_message_queue_receive( return RTEMS_INVALID_ADDRESS; } - the_message_queue = _Message_queue_Get( id, &lock_context ); + the_message_queue = _Message_queue_Get( id, &queue_context, NULL ); if ( the_message_queue == NULL ) { #if defined(RTEMS_MULTIPROCESSING) @@ -55,7 +55,7 @@ rtems_status_code rtems_message_queue_receive( _CORE_message_queue_Acquire_critical( &the_message_queue->message_queue, - &lock_context + &queue_context ); executing = _Thread_Executing; @@ -66,7 +66,7 @@ rtems_status_code rtems_message_queue_receive( size, !_Options_Is_no_wait( option_set ), timeout, - &lock_context + &queue_context ); return _Message_queue_Translate_core_message_queue_return_code( executing->Wait.return_code -- cgit v1.2.3