From 8d0b7d96439c8dcce6e3c1ab7ca732402f92a2c4 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 1 Dec 1995 22:03:55 +0000 Subject: Insert mode argument to _Watchdog_Insert removed. Now are watchdog timers are automatically activated upon insertion. --- c/src/exec/score/inline/rtems/score/tod.inl | 6 +----- c/src/exec/score/inline/rtems/score/watchdog.inl | 16 +++++----------- c/src/exec/score/inline/tod.inl | 6 +----- c/src/exec/score/inline/watchdog.inl | 16 +++++----------- 4 files changed, 12 insertions(+), 32 deletions(-) (limited to 'c/src/exec/score/inline') diff --git a/c/src/exec/score/inline/rtems/score/tod.inl b/c/src/exec/score/inline/rtems/score/tod.inl index d2e26e2f2a..dce8aca426 100644 --- a/c/src/exec/score/inline/rtems/score/tod.inl +++ b/c/src/exec/score/inline/rtems/score/tod.inl @@ -61,11 +61,7 @@ STATIC INLINE void _TOD_Activate( Watchdog_Interval ticks ) { - _Watchdog_Insert_ticks( - &_TOD_Seconds_watchdog, - ticks, - WATCHDOG_ACTIVATE_NOW - ); + _Watchdog_Insert_ticks( &_TOD_Seconds_watchdog, ticks ); } #endif diff --git a/c/src/exec/score/inline/rtems/score/watchdog.inl b/c/src/exec/score/inline/rtems/score/watchdog.inl index bb7edb82ed..ae3717e102 100644 --- a/c/src/exec/score/inline/rtems/score/watchdog.inl +++ b/c/src/exec/score/inline/rtems/score/watchdog.inl @@ -115,14 +115,13 @@ STATIC INLINE void _Watchdog_Tickle_seconds( void ) STATIC INLINE void _Watchdog_Insert_ticks( Watchdog_Control *the_watchdog, - Watchdog_Interval units, - Watchdog_Insert_modes insert_mode + Watchdog_Interval units ) { the_watchdog->initial = units; - _Watchdog_Insert( &_Watchdog_Ticks_chain, the_watchdog, insert_mode ); + _Watchdog_Insert( &_Watchdog_Ticks_chain, the_watchdog ); } @@ -134,14 +133,13 @@ STATIC INLINE void _Watchdog_Insert_ticks( STATIC INLINE void _Watchdog_Insert_seconds( Watchdog_Control *the_watchdog, - Watchdog_Interval units, - Watchdog_Insert_modes insert_mode + Watchdog_Interval units ) { the_watchdog->initial = units; - _Watchdog_Insert( &_Watchdog_Seconds_chain, the_watchdog, insert_mode ); + _Watchdog_Insert( &_Watchdog_Seconds_chain, the_watchdog ); } @@ -190,11 +188,7 @@ STATIC INLINE void _Watchdog_Reset( (void) _Watchdog_Remove( the_watchdog ); - _Watchdog_Insert( - &_Watchdog_Ticks_chain, - the_watchdog, - WATCHDOG_ACTIVATE_NOW - ); + _Watchdog_Insert( &_Watchdog_Ticks_chain, the_watchdog ); } diff --git a/c/src/exec/score/inline/tod.inl b/c/src/exec/score/inline/tod.inl index d2e26e2f2a..dce8aca426 100644 --- a/c/src/exec/score/inline/tod.inl +++ b/c/src/exec/score/inline/tod.inl @@ -61,11 +61,7 @@ STATIC INLINE void _TOD_Activate( Watchdog_Interval ticks ) { - _Watchdog_Insert_ticks( - &_TOD_Seconds_watchdog, - ticks, - WATCHDOG_ACTIVATE_NOW - ); + _Watchdog_Insert_ticks( &_TOD_Seconds_watchdog, ticks ); } #endif diff --git a/c/src/exec/score/inline/watchdog.inl b/c/src/exec/score/inline/watchdog.inl index bb7edb82ed..ae3717e102 100644 --- a/c/src/exec/score/inline/watchdog.inl +++ b/c/src/exec/score/inline/watchdog.inl @@ -115,14 +115,13 @@ STATIC INLINE void _Watchdog_Tickle_seconds( void ) STATIC INLINE void _Watchdog_Insert_ticks( Watchdog_Control *the_watchdog, - Watchdog_Interval units, - Watchdog_Insert_modes insert_mode + Watchdog_Interval units ) { the_watchdog->initial = units; - _Watchdog_Insert( &_Watchdog_Ticks_chain, the_watchdog, insert_mode ); + _Watchdog_Insert( &_Watchdog_Ticks_chain, the_watchdog ); } @@ -134,14 +133,13 @@ STATIC INLINE void _Watchdog_Insert_ticks( STATIC INLINE void _Watchdog_Insert_seconds( Watchdog_Control *the_watchdog, - Watchdog_Interval units, - Watchdog_Insert_modes insert_mode + Watchdog_Interval units ) { the_watchdog->initial = units; - _Watchdog_Insert( &_Watchdog_Seconds_chain, the_watchdog, insert_mode ); + _Watchdog_Insert( &_Watchdog_Seconds_chain, the_watchdog ); } @@ -190,11 +188,7 @@ STATIC INLINE void _Watchdog_Reset( (void) _Watchdog_Remove( the_watchdog ); - _Watchdog_Insert( - &_Watchdog_Ticks_chain, - the_watchdog, - WATCHDOG_ACTIVATE_NOW - ); + _Watchdog_Insert( &_Watchdog_Ticks_chain, the_watchdog ); } -- cgit v1.2.3