From 258d580c42a0bc89c2028fb1ff6a4a97792bdcaa Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Sat, 13 Jun 2015 14:49:23 +0200 Subject: score: Delete unused state WATCHDOG_REMOVE_IT --- cpukit/posix/src/alarm.c | 2 +- cpukit/posix/src/ualarm.c | 2 +- cpukit/score/include/rtems/score/watchdog.h | 6 +----- cpukit/score/include/rtems/score/watchdogimpl.h | 14 -------------- cpukit/score/src/watchdogremove.c | 6 +----- 5 files changed, 4 insertions(+), 26 deletions(-) diff --git a/cpukit/posix/src/alarm.c b/cpukit/posix/src/alarm.c index 6f051d7190..7045a9c527 100644 --- a/cpukit/posix/src/alarm.c +++ b/cpukit/posix/src/alarm.c @@ -74,7 +74,7 @@ unsigned int alarm( _Thread_Disable_dispatch(); state = _Watchdog_Remove_seconds( the_timer ); - if ( (state == WATCHDOG_ACTIVE) || (state == WATCHDOG_REMOVE_IT) ) { + if ( state == WATCHDOG_ACTIVE ) { /* * The stop_time and start_time fields are snapshots of ticks since * boot. Since alarm() is dealing in seconds, we must account for diff --git a/cpukit/posix/src/ualarm.c b/cpukit/posix/src/ualarm.c index 9235ef165c..dc271b44a8 100644 --- a/cpukit/posix/src/ualarm.c +++ b/cpukit/posix/src/ualarm.c @@ -73,7 +73,7 @@ useconds_t ualarm( _Thread_Disable_dispatch(); state = _Watchdog_Remove_ticks( the_timer ); - if ( (state == WATCHDOG_ACTIVE) || (state == WATCHDOG_REMOVE_IT) ) { + if ( state == WATCHDOG_ACTIVE ) { /* * The stop_time and start_time fields are snapshots of ticks since * boot. Since alarm() is dealing in seconds, we must account for diff --git a/cpukit/score/include/rtems/score/watchdog.h b/cpukit/score/include/rtems/score/watchdog.h index ff6c8233a7..bad7269051 100644 --- a/cpukit/score/include/rtems/score/watchdog.h +++ b/cpukit/score/include/rtems/score/watchdog.h @@ -86,11 +86,7 @@ typedef enum { */ WATCHDOG_BEING_INSERTED, /** This is the state when the watchdog is on a chain, and allowed to fire. */ - WATCHDOG_ACTIVE, - /** This is the state when the watchdog is on a chain, but we should - * remove without firing if it expires. - */ - WATCHDOG_REMOVE_IT + WATCHDOG_ACTIVE } Watchdog_States; /** diff --git a/cpukit/score/include/rtems/score/watchdogimpl.h b/cpukit/score/include/rtems/score/watchdogimpl.h index 8405232a87..ad6ab5bcb9 100644 --- a/cpukit/score/include/rtems/score/watchdogimpl.h +++ b/cpukit/score/include/rtems/score/watchdogimpl.h @@ -316,20 +316,6 @@ RTEMS_INLINE_ROUTINE void _Watchdog_Activate( } -/** - * This routine deactivates THE_WATCHDOG timer which will remain - * on a watchdog chain. - */ - -RTEMS_INLINE_ROUTINE void _Watchdog_Deactivate( - Watchdog_Control *the_watchdog -) -{ - - the_watchdog->state = WATCHDOG_REMOVE_IT; - -} - /** * This routine is invoked at each clock tick to update the ticks * watchdog chain. diff --git a/cpukit/score/src/watchdogremove.c b/cpukit/score/src/watchdogremove.c index 2ac63fe998..03c0c5f0fe 100644 --- a/cpukit/score/src/watchdogremove.c +++ b/cpukit/score/src/watchdogremove.c @@ -31,10 +31,7 @@ static void _Watchdog_Remove_it( const Chain_Node *iterator_tail; Chain_Node *iterator_node; - _Assert( - the_watchdog->state == WATCHDOG_ACTIVE - || the_watchdog->state == WATCHDOG_REMOVE_IT - ); + _Assert( the_watchdog->state == WATCHDOG_ACTIVE ); the_watchdog->state = WATCHDOG_INACTIVE; the_watchdog->stop_time = _Watchdog_Ticks_since_boot; @@ -99,7 +96,6 @@ Watchdog_States _Watchdog_Remove( break; case WATCHDOG_ACTIVE: - case WATCHDOG_REMOVE_IT: _Watchdog_Remove_it( header, the_watchdog ); break; } -- cgit v1.2.3