Rename _MRSP_Obtain() into _MRSP_Seize(). Rename _MRSP_Release() into _MRSP_Surrender(). This avoids confusion with the ISR lock acquire and release. --- cpukit/rtems/src/semobtain.c | 2 +- cpukit/rtems/src/semrelease.c | 2 +- cpukit/score/include/rtems/score/mrspimpl.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cpukit/rtems/src/semobtain.c b/cpukit/rtems/src/semobtain.c index 556738f..e3d6f3c 100644 --- a/cpukit/rtems/src/semobtain.c +++ b/cpukit/rtems/src/semobtain.c @@ -69,7 +69,7 @@ rtems_status_code rtems_semaphore_obtain( if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) ) { MRSP_Status mrsp_status; - mrsp_status = _MRSP_Obtain( + mrsp_status = _MRSP_Seize( &the_semaphore->Core_control.mrsp, executing, wait, diff --git a/cpukit/rtems/src/semrelease.c b/cpukit/rtems/src/semrelease.c index 4a6ccb2..762328c 100644 --- a/cpukit/rtems/src/semrelease.c +++ b/cpukit/rtems/src/semrelease.c @@ -57,7 +57,7 @@ rtems_status_code rtems_semaphore_release( if ( _Attributes_Is_multiprocessor_resource_sharing( attribute_set ) ) { MRSP_Status mrsp_status; - mrsp_status = _MRSP_Release( + mrsp_status = _MRSP_Surrender( &the_semaphore->Core_control.mrsp, _Thread_Executing, &lock_context diff --git a/cpukit/score/include/rtems/score/mrspimpl.h b/cpukit/score/include/rtems/score/mrspimpl.h index 1287ad1..1529b1a 100644 --- a/cpukit/score/include/rtems/score/mrspimpl.h +++ b/cpukit/score/include/rtems/score/mrspimpl.h @@ -268,7 +268,7 @@ RTEMS_INLINE_ROUTINE MRSP_Status _MRSP_Wait_for_ownership( return status; } -RTEMS_INLINE_ROUTINE MRSP_Status _MRSP_Obtain( +RTEMS_INLINE_ROUTINE MRSP_Status _MRSP_Seize( MRSP_Control *mrsp, Thread_Control *executing, bool wait, @@ -326,7 +326,7 @@ RTEMS_INLINE_ROUTINE MRSP_Status _MRSP_Obtain( return status; } -RTEMS_INLINE_ROUTINE MRSP_Status _MRSP_Release( +RTEMS_INLINE_ROUTINE MRSP_Status _MRSP_Surrender( MRSP_Control *mrsp, Thread_Control *executing, ISR_lock_Context *lock_context -- 1.8.4.5 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel