diff options
| author | Gedare Bloom <gedare@rtems.org> | 2016-06-09 11:33:15 -0400 |
|---|---|---|
| committer | Gedare Bloom <gedare@rtems.org> | 2016-07-25 12:44:47 -0400 |
| commit | f23d4706169d68d3c4e90b297650f89c272716f4 (patch) | |
| tree | 333bdc4b4be2ec4ad7ee80ee03229759ec60602a /cpukit/score/include/rtems/score/mrspimpl.h | |
| parent | score: Fix for RTEMS_DEBUG (diff) | |
| download | rtems-f23d4706169d68d3c4e90b297650f89c272716f4.tar.bz2 | |
cpukit: Add and use Watchdog_Discipline.
Clock disciplines may be WATCHDOG_RELATIVE, WATCHDOG_ABSOLUTE,
or WATCHDOG_NO_TIMEOUT. A discipline of WATCHDOG_RELATIVE with
a timeout of WATCHDOG_NO_TIMEOUT is equivalent to a discipline
of WATCHDOG_NO_TIMEOUT.
updates #2732
Diffstat (limited to 'cpukit/score/include/rtems/score/mrspimpl.h')
| -rw-r--r-- | cpukit/score/include/rtems/score/mrspimpl.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpukit/score/include/rtems/score/mrspimpl.h b/cpukit/score/include/rtems/score/mrspimpl.h index 66f5cc6640..c136a2037c 100644 --- a/cpukit/score/include/rtems/score/mrspimpl.h +++ b/cpukit/score/include/rtems/score/mrspimpl.h @@ -240,7 +240,6 @@ RTEMS_INLINE_ROUTINE Status_Control _MRSP_Wait_for_ownership( Thread_Control *executing, Priority_Control initial_priority, Priority_Control ceiling_priority, - Watchdog_Interval timeout, Thread_queue_Context *queue_context ) { @@ -250,6 +249,8 @@ RTEMS_INLINE_ROUTINE Status_Control _MRSP_Wait_for_ownership( Per_CPU_Control *cpu_self; ISR_lock_Context giant_lock_context; ISR_Level level; + Watchdog_Interval timeout = queue_context->timeout; + _Assert( queue_context->timeout_discipline == WATCHDOG_RELATIVE ); rival.thread = executing; rival.resource = mrsp; @@ -317,7 +318,6 @@ RTEMS_INLINE_ROUTINE Status_Control _MRSP_Seize( MRSP_Control *mrsp, Thread_Control *executing, bool wait, - Watchdog_Interval timeout, Thread_queue_Context *queue_context ) { @@ -357,7 +357,6 @@ RTEMS_INLINE_ROUTINE Status_Control _MRSP_Seize( executing, initial_priority, ceiling_priority, - timeout, queue_context ); } else { |