[rtems commit] score: Rename _Watchdog_Reset()

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    1dc66622762fa9921a62fc0cd73f12641278f23f
Changeset: http://git.rtems.org/rtems/commit/?id=1dc66622762fa9921a62fc0cd73f12641278f23f

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Apr 13 13:57:57 2015 +0200

score: Rename _Watchdog_Reset()

Update #2307.

---

 cpukit/posix/src/ualarm.c                       | 2 +-
 cpukit/rtems/src/timerreset.c                   | 3 +--
 cpukit/score/include/rtems/score/watchdogimpl.h | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cpukit/posix/src/ualarm.c b/cpukit/posix/src/ualarm.c
index 46fc533..d9a85e6 100644
--- a/cpukit/posix/src/ualarm.c
+++ b/cpukit/posix/src/ualarm.c
@@ -54,7 +54,7 @@ static void _POSIX_signals_Ualarm_TSR(
   /*
    * If the reset interval is non-zero, reschedule ourselves.
    */
-  _Watchdog_Reset( &_POSIX_signals_Ualarm_timer );
+  _Watchdog_Reset_ticks( &_POSIX_signals_Ualarm_timer );
 }
 
 useconds_t ualarm(
diff --git a/cpukit/rtems/src/timerreset.c b/cpukit/rtems/src/timerreset.c
index 495780a..49c4925 100644
--- a/cpukit/rtems/src/timerreset.c
+++ b/cpukit/rtems/src/timerreset.c
@@ -51,8 +51,7 @@ rtems_status_code rtems_timer_reset(
 
     case OBJECTS_LOCAL:
       if ( the_timer->the_class == TIMER_INTERVAL ) {
-        _Watchdog_Remove( &the_timer->Ticker );
-        _Watchdog_Insert( &_Watchdog_Ticks_header, &the_timer->Ticker );
+        _Watchdog_Reset_ticks( &the_timer->Ticker );
       } else if ( the_timer->the_class == TIMER_INTERVAL_ON_TASK ) {
         Timer_server_Control *timer_server = _Timer_server;
 
diff --git a/cpukit/score/include/rtems/score/watchdogimpl.h b/cpukit/score/include/rtems/score/watchdogimpl.h
index 67a2d69..83db868 100644
--- a/cpukit/score/include/rtems/score/watchdogimpl.h
+++ b/cpukit/score/include/rtems/score/watchdogimpl.h
@@ -321,7 +321,7 @@ RTEMS_INLINE_ROUTINE void _Watchdog_Insert_seconds(
  * many ticks.
  */
 
-RTEMS_INLINE_ROUTINE void _Watchdog_Reset(
+RTEMS_INLINE_ROUTINE void _Watchdog_Reset_ticks(
   Watchdog_Control *the_watchdog
 )
 {