diff options
Diffstat (limited to 'cpukit/score/src')
-rw-r--r-- | cpukit/score/src/coretod.c | 3 | ||||
-rw-r--r-- | cpukit/score/src/threadq.c | 6 | ||||
-rw-r--r-- | cpukit/score/src/watchdog.c | 12 |
3 files changed, 7 insertions, 14 deletions
diff --git a/cpukit/score/src/coretod.c b/cpukit/score/src/coretod.c index 06f30654cc..1a11034ceb 100644 --- a/cpukit/score/src/coretod.c +++ b/cpukit/score/src/coretod.c @@ -231,6 +231,5 @@ void _TOD_Tickle( } _Watchdog_Tickle_seconds(); - _Watchdog_Insert_ticks( &_TOD_Seconds_watchdog, _TOD_Ticks_per_second, - WATCHDOG_ACTIVATE_NOW ); + _Watchdog_Insert_ticks( &_TOD_Seconds_watchdog, _TOD_Ticks_per_second ); } diff --git a/cpukit/score/src/threadq.c b/cpukit/score/src/threadq.c index 87e7903df4..f388959268 100644 --- a/cpukit/score/src/threadq.c +++ b/cpukit/score/src/threadq.c @@ -109,11 +109,7 @@ void _Thread_queue_Enqueue( NULL ); - _Watchdog_Insert_ticks( - &the_thread->Timer, - timeout, - WATCHDOG_ACTIVATE_NOW - ); + _Watchdog_Insert_ticks( &the_thread->Timer, timeout ); } switch( the_thread_queue->discipline ) { diff --git a/cpukit/score/src/watchdog.c b/cpukit/score/src/watchdog.c index b7963f5408..0f72bd3d5c 100644 --- a/cpukit/score/src/watchdog.c +++ b/cpukit/score/src/watchdog.c @@ -140,8 +140,7 @@ void _Watchdog_Adjust( void _Watchdog_Insert( Chain_Control *header, - Watchdog_Control *the_watchdog, - Watchdog_Insert_modes insert_mode + Watchdog_Control *the_watchdog ) { ISR_Level level; @@ -174,10 +173,10 @@ restart: delta_interval -= after->delta_interval; /* - * If you experience problems comment out the _ISR_Flash line. This - * (3.2.0) is the first release with this critical section redesigned. + * If you experience problems comment out the _ISR_Flash line. + * 3.2.0 was the first release with this critical section redesigned. * Under certain circumstances, the PREVIOUS critical section algorithm - * used around this flash point allows interrupts to execute + * used around this flash point allowed interrupts to execute * which violated the design assumptions. The critical section * mechanism used here WAS redesigned to address this. */ @@ -195,8 +194,7 @@ restart: } } - if ( insert_mode == WATCHDOG_ACTIVATE_NOW ) - _Watchdog_Activate( the_watchdog ); + _Watchdog_Activate( the_watchdog ); the_watchdog->delta_interval = delta_interval; |