score: Add header to _Watchdog_Remove()

Add watchdog header parameter to _Watchdog_Remove() to be in line with
the other operations.  Add _Watchdog_Remove_ticks() and
_Watchdog_Remove_seconds() for convenience.

Update #2307.

8 files changed, 9 insertions, 9 deletions

diff --git a/cpukit/posix/src/alarm.c b/cpukit/posix/src/alarm.c
index 48036617d4..6f051d7190 100644
--- a/cpukit/posix/src/alarm.c
+++ b/cpukit/posix/src/alarm.c
@@ -73,7 +73,7 @@ unsigned int alarm(
 
   _Thread_Disable_dispatch();
 
-  state = _Watchdog_Remove( the_timer );
+  state = _Watchdog_Remove_seconds( the_timer );
   if ( (state == WATCHDOG_ACTIVE) || (state == WATCHDOG_REMOVE_IT) ) {
     /*
      *  The stop_time and start_time fields are snapshots of ticks since
diff --git a/cpukit/posix/src/psignalunblockthread.c b/cpukit/posix/src/psignalunblockthread.c
index 1b3db68262..3b310a90b7 100644
--- a/cpukit/posix/src/psignalunblockthread.c
+++ b/cpukit/posix/src/psignalunblockthread.c
@@ -115,7 +115,7 @@ bool _POSIX_signals_Unblock_thread(
        *  queue, but is also interruptible by a POSIX signal.
        */
        if ( _States_Is_delaying(the_thread->current_state) ) {
-          (void) _Watchdog_Remove( &the_thread->Timer );
+          _Watchdog_Remove_ticks( &the_thread->Timer );
           _Thread_Unblock( the_thread );
        } else {
          _Thread_queue_Extract_with_proxy( the_thread );
diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c
index 4d28de536f..97882bf4cb 100644
--- a/cpukit/posix/src/pthread.c
+++ b/cpukit/posix/src/pthread.c
@@ -286,7 +286,7 @@ static void _POSIX_Threads_Terminate_extension(
       *(void **)the_thread->Wait.return_argument = value_ptr;
 
   if ( api->schedpolicy == SCHED_SPORADIC )
-    (void) _Watchdog_Remove( &api->Sporadic_timer );
+    _Watchdog_Remove_ticks( &api->Sporadic_timer );
 
   _Thread_Enable_dispatch();
 }
diff --git a/cpukit/posix/src/pthreadsetschedparam.c b/cpukit/posix/src/pthreadsetschedparam.c
index d5d0a5ba8a..dcb70bdec8 100644
--- a/cpukit/posix/src/pthreadsetschedparam.c
+++ b/cpukit/posix/src/pthreadsetschedparam.c
@@ -70,7 +70,7 @@ int pthread_setschedparam(
       api = the_thread->API_Extensions[ THREAD_API_POSIX ];
 
       if ( api->schedpolicy == SCHED_SPORADIC )
-        (void) _Watchdog_Remove( &api->Sporadic_timer );
+        _Watchdog_Remove_ticks( &api->Sporadic_timer );
 
       api->schedpolicy = policy;
       api->schedparam  = *param;
@@ -99,7 +99,7 @@ int pthread_setschedparam(
 
         case SCHED_SPORADIC:
           api->ss_high_priority = api->schedparam.sched_priority;
-          _Watchdog_Remove( &api->Sporadic_timer );
+          _Watchdog_Remove_ticks( &api->Sporadic_timer );
           _POSIX_Threads_Sporadic_budget_TSR( 0, the_thread );
           break;
       }
diff --git a/cpukit/posix/src/timerdelete.c b/cpukit/posix/src/timerdelete.c
index 71b25faed9..e090be2aca 100644
--- a/cpukit/posix/src/timerdelete.c
+++ b/cpukit/posix/src/timerdelete.c
@@ -54,7 +54,7 @@ int timer_delete(
     case OBJECTS_LOCAL:
       _Objects_Close( &_POSIX_Timer_Information, &ptimer->Object );
       ptimer->state = POSIX_TIMER_STATE_FREE;
-      (void) _Watchdog_Remove( &ptimer->Timer );
+      _Watchdog_Remove_ticks( &ptimer->Timer );
       _Objects_Put( &ptimer->Object );
       _POSIX_Timer_Free( ptimer );
       _Objects_Allocator_unlock();
diff --git a/cpukit/posix/src/timerinserthelper.c b/cpukit/posix/src/timerinserthelper.c
index 9d028350ad..4d7c3fb681 100644
--- a/cpukit/posix/src/timerinserthelper.c
+++ b/cpukit/posix/src/timerinserthelper.c
@@ -39,7 +39,7 @@ bool _POSIX_Timer_Insert_helper(
 {
   ISR_Level            level;
 
-  (void) _Watchdog_Remove( timer );
+  _Watchdog_Remove_ticks( timer );
   _ISR_Disable( level );
 
     /*
diff --git a/cpukit/posix/src/timersettime.c b/cpukit/posix/src/timersettime.c
index 6cc378082a..2967df6df0 100644
--- a/cpukit/posix/src/timersettime.c
+++ b/cpukit/posix/src/timersettime.c
@@ -85,7 +85,7 @@ int timer_settime(
       /* First, it verifies if the timer must be stopped */
       if ( normalize.it_value.tv_sec == 0 && normalize.it_value.tv_nsec == 0 ) {
          /* Stop the timer */
-         (void) _Watchdog_Remove( &ptimer->Timer );
+         _Watchdog_Remove_ticks( &ptimer->Timer );
          /* The old data of the timer are returned */
          if ( ovalue )
            *ovalue = ptimer->timer_data;
diff --git a/cpukit/posix/src/ualarm.c b/cpukit/posix/src/ualarm.c
index d9a85e6a92..9235ef165c 100644
--- a/cpukit/posix/src/ualarm.c
+++ b/cpukit/posix/src/ualarm.c
@@ -72,7 +72,7 @@ useconds_t ualarm(
 
   _Thread_Disable_dispatch();
 
-  state = _Watchdog_Remove( the_timer );
+  state = _Watchdog_Remove_ticks( the_timer );
   if ( (state == WATCHDOG_ACTIVE) || (state == WATCHDOG_REMOVE_IT) ) {
     /*
      *  The stop_time and start_time fields are snapshots of ticks since