diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-04-15 16:28:42 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-05-19 12:00:42 +0200 |
commit | 6d2539413bcc0be45b6fb40e93b4012a1d91b58f (patch) | |
tree | 57df90da33bc49a78095c95f286d8824bf940b2e /cpukit/score/src/watchdogtickle.c | |
parent | score: Add header to _Watchdog_Remove() (diff) | |
download | rtems-6d2539413bcc0be45b6fb40e93b4012a1d91b58f.tar.bz2 |
score: Add _Watchdog_Acquire|Release|Flash()
Update #2307.
Diffstat (limited to 'cpukit/score/src/watchdogtickle.c')
-rw-r--r-- | cpukit/score/src/watchdogtickle.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpukit/score/src/watchdogtickle.c b/cpukit/score/src/watchdogtickle.c index 5b2f2582fc..2092010dcc 100644 --- a/cpukit/score/src/watchdogtickle.c +++ b/cpukit/score/src/watchdogtickle.c @@ -25,9 +25,9 @@ void _Watchdog_Tickle( Watchdog_Header *header ) { - ISR_Level level; + ISR_lock_Context lock_context; Watchdog_Control *the_watchdog; - Watchdog_States watchdog_state; + Watchdog_States watchdog_state; /* * See the comment in watchdoginsert.c and watchdogadjust.c @@ -35,7 +35,7 @@ void _Watchdog_Tickle( * volatile data - till, 2003/7 */ - _ISR_Disable( level ); + _Watchdog_Acquire( header, &lock_context ); if ( _Watchdog_Is_empty( header ) ) goto leave; @@ -76,7 +76,7 @@ void _Watchdog_Tickle( do { watchdog_state = _Watchdog_Remove( header, the_watchdog ); - _ISR_Enable( level ); + _Watchdog_Release( header, &lock_context ); switch( watchdog_state ) { case WATCHDOG_ACTIVE: @@ -106,12 +106,12 @@ void _Watchdog_Tickle( break; } - _ISR_Disable( level ); + _Watchdog_Acquire( header, &lock_context ); the_watchdog = _Watchdog_First( header ); } while ( !_Watchdog_Is_empty( header ) && (the_watchdog->delta_interval == 0) ); leave: - _ISR_Enable(level); + _Watchdog_Release( header, &lock_context ); } |