summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-19 15:04:34 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-21 07:29:40 +0200
commit242a05a586fa09537e855c1eced5807f7127271f (patch)
tree794fa22777d264424efdce32b36e3d6acfe521aa
parentscore: Optimize _Objects_Get_local() (diff)
downloadrtems-242a05a586fa09537e855c1eced5807f7127271f.tar.bz2
score: Rename _MRSP_Obtain()
Rename _MRSP_Obtain() into _MRSP_Seize(). Rename _MRSP_Release() into _MRSP_Surrender(). This avoids confusion with the ISR lock acquire and release.
-rw-r--r--cpukit/rtems/src/semobtain.c2
-rw-r--r--cpukit/rtems/src/semrelease.c2
-rw-r--r--cpukit/score/include/rtems/score/mrspimpl.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/cpukit/rtems/src/semobtain.c b/cpukit/rtems/src/semobtain.c
index 556738fcce..e3d6f3c20d 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 4a6ccb2817..762328c309 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 1287ad1f50..1529b1a461 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