diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-09-23 11:29:48 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-09-27 07:39:03 +0200 |
| commit | 94d5b390e58eb562fbfba4c1a28052a663f13e42 (patch) | |
| tree | 4c12d5fb30a624979fbe0cb6a19367fcf92ee344 /cpukit/score/include/rtems/score/coremuteximpl.h | |
| parent | score: Fix warning (diff) | |
| download | rtems-94d5b390e58eb562fbfba4c1a28052a663f13e42.tar.bz2 | |
score: Simplify CORE mutex seize
Rename _CORE_mutex_Seize_no_protocol_slow() in _CORE_mutex_Seize_slow().
Remove previous _CORE_mutex_Seize_slow() since the protocol handling is
now done in the thread queue operations.
Diffstat (limited to 'cpukit/score/include/rtems/score/coremuteximpl.h')
| -rw-r--r-- | cpukit/score/include/rtems/score/coremuteximpl.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/cpukit/score/include/rtems/score/coremuteximpl.h b/cpukit/score/include/rtems/score/coremuteximpl.h index a30d1a880e..d30e38d84e 100644 --- a/cpukit/score/include/rtems/score/coremuteximpl.h +++ b/cpukit/score/include/rtems/score/coremuteximpl.h @@ -93,14 +93,6 @@ RTEMS_INLINE_ROUTINE bool _CORE_mutex_Is_locked( } Status_Control _CORE_mutex_Seize_slow( - CORE_mutex_Control *the_mutex, - Thread_Control *executing, - Thread_Control *owner, - bool wait, - Thread_queue_Context *queue_context -); - -Status_Control _CORE_mutex_Seize_no_protocol_slow( CORE_mutex_Control *the_mutex, const Thread_queue_Operations *operations, Thread_Control *executing, @@ -171,8 +163,8 @@ RTEMS_INLINE_ROUTINE Status_Control _CORE_recursive_mutex_Seize( return _CORE_mutex_Seize_slow( &the_mutex->Mutex, + CORE_MUTEX_TQ_PRIORITY_INHERIT_OPERATIONS, executing, - owner, wait, queue_context ); @@ -251,7 +243,7 @@ RTEMS_INLINE_ROUTINE Status_Control _CORE_recursive_mutex_Seize_no_protocol( return status; } - return _CORE_mutex_Seize_no_protocol_slow( + return _CORE_mutex_Seize_slow( &the_mutex->Mutex, operations, executing, @@ -444,7 +436,7 @@ RTEMS_INLINE_ROUTINE Status_Control _CORE_ceiling_mutex_Seize( return status; } - return _CORE_mutex_Seize_no_protocol_slow( + return _CORE_mutex_Seize_slow( &the_mutex->Recursive.Mutex, CORE_MUTEX_TQ_OPERATIONS, executing, |