diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-26 22:29:56 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-30 16:16:22 +0200 |
| commit | 09c5ca4cb4f30ba9e0c3c3915a70af7ff3916ec0 (patch) | |
| tree | 70b4e6167e38902fce2ffebbf343df6ac8a6fe06 /cpukit/score | |
| parent | score: Add semaphore variants (diff) | |
| download | rtems-09c5ca4cb4f30ba9e0c3c3915a70af7ff3916ec0.tar.bz2 | |
score: Simplify CORE mutex
Remove superfluous support for simple binary semaphores. With this we
can get rid of the CORE_MUTEX_NESTING_BLOCKS variant.
Diffstat (limited to 'cpukit/score')
| -rw-r--r-- | cpukit/score/include/rtems/score/coremutex.h | 7 | ||||
| -rw-r--r-- | cpukit/score/include/rtems/score/coremuteximpl.h | 2 | ||||
| -rw-r--r-- | cpukit/score/src/coremutexsurrender.c | 3 |
3 files changed, 0 insertions, 12 deletions
diff --git a/cpukit/score/include/rtems/score/coremutex.h b/cpukit/score/include/rtems/score/coremutex.h index 41f1c4f22d..f8694095ac 100644 --- a/cpukit/score/include/rtems/score/coremutex.h +++ b/cpukit/score/include/rtems/score/coremutex.h @@ -87,13 +87,6 @@ typedef enum { */ CORE_MUTEX_NESTING_IS_ERROR, #endif - /** - * This sequence performs as indicated: - * + lock(m) - * + lock(m) - deadlocks or timeouts - * + unlock(m) - releases - */ - CORE_MUTEX_NESTING_BLOCKS } CORE_mutex_Nesting_behaviors; /** diff --git a/cpukit/score/include/rtems/score/coremuteximpl.h b/cpukit/score/include/rtems/score/coremuteximpl.h index e29d4b7f5d..ccc414827d 100644 --- a/cpukit/score/include/rtems/score/coremuteximpl.h +++ b/cpukit/score/include/rtems/score/coremuteximpl.h @@ -238,8 +238,6 @@ RTEMS_INLINE_ROUTINE Status_Control _CORE_mutex_Seize_interrupt_trylock( _CORE_mutex_Release( the_mutex, queue_context ); return STATUS_NESTING_NOT_ALLOWED; #endif - case CORE_MUTEX_NESTING_BLOCKS: - break; } } diff --git a/cpukit/score/src/coremutexsurrender.c b/cpukit/score/src/coremutexsurrender.c index 1da98276bf..6047409085 100644 --- a/cpukit/score/src/coremutexsurrender.c +++ b/cpukit/score/src/coremutexsurrender.c @@ -76,9 +76,6 @@ Status_Control _CORE_mutex_Surrender( _CORE_mutex_Release( the_mutex, queue_context ); return STATUS_NESTING_NOT_ALLOWED; #endif - case CORE_MUTEX_NESTING_BLOCKS: - /* Currently no API exercises this behavior. */ - break; } #else _CORE_mutex_Release( the_mutex, queue_context ); |