From 9809d6e08264525ea58839b98e6d90121b841196 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 30 Mar 2016 11:39:58 +0200 Subject: score: _Thread_queue_Flush() parameter changes Change _Thread_queue_Flush() into a macro that invokes _Thread_queue_Do_flush() with the parameter set defined by RTEMS_MULTIPROCESSING. For multiprocessing configurations add the object identifier to avoid direct use of the thread wait information. Use mp_ prefix for multiprocessing related parameters. Rename Thread_queue_Flush_callout to Thread_queue_MP_callout since this type will be re-used later for other operations as well. --- cpukit/rtems/src/semdelete.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'cpukit/rtems/src/semdelete.c') diff --git a/cpukit/rtems/src/semdelete.c b/cpukit/rtems/src/semdelete.c index e9c3ad21e9..6a83d25390 100644 --- a/cpukit/rtems/src/semdelete.c +++ b/cpukit/rtems/src/semdelete.c @@ -31,12 +31,6 @@ #include -#if defined(RTEMS_MULTIPROCESSING) -#define SEMAPHORE_MP_OBJECT_WAS_DELETED _Semaphore_MP_Send_object_was_deleted -#else -#define SEMAPHORE_MP_OBJECT_WAS_DELETED NULL -#endif - rtems_status_code rtems_semaphore_delete( rtems_id id ) @@ -73,15 +67,17 @@ rtems_status_code rtems_semaphore_delete( } _CORE_mutex_Flush( &the_semaphore->Core_control.mutex, - SEMAPHORE_MP_OBJECT_WAS_DELETED, - CORE_MUTEX_WAS_DELETED + CORE_MUTEX_WAS_DELETED, + _Semaphore_MP_Send_object_was_deleted, + id ); _CORE_mutex_Destroy( &the_semaphore->Core_control.mutex ); } else { _CORE_semaphore_Flush( &the_semaphore->Core_control.semaphore, - SEMAPHORE_MP_OBJECT_WAS_DELETED, - CORE_SEMAPHORE_WAS_DELETED + CORE_SEMAPHORE_WAS_DELETED, + _Semaphore_MP_Send_object_was_deleted, + id ); _CORE_semaphore_Destroy( &the_semaphore->Core_control.semaphore ); } -- cgit v1.2.3