From 8d0b7d96439c8dcce6e3c1ab7ca732402f92a2c4 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
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.

---
 cpukit/rtems/src/event.c      | 6 +-----
 cpukit/rtems/src/ratemon.c    | 6 ++----
 cpukit/rtems/src/rtemstimer.c | 9 +++++----
 cpukit/rtems/src/tasks.c      | 9 +++++----
 4 files changed, 13 insertions(+), 17 deletions(-)

(limited to 'cpukit/rtems/src')

diff --git a/cpukit/rtems/src/event.c b/cpukit/rtems/src/event.c
index d388de0b81..9bea949647 100644
--- a/cpukit/rtems/src/event.c
+++ b/cpukit/rtems/src/event.c
@@ -186,11 +186,7 @@ void _Event_Seize(
       executing->Object.id,
       NULL
     );
-    _Watchdog_Insert_ticks(
-      &executing->Timer,
-      ticks,
-      WATCHDOG_ACTIVATE_NOW
-    );
+    _Watchdog_Insert_ticks( &executing->Timer, ticks );
   }
 
   _Thread_Set_state( executing, STATES_WAITING_FOR_EVENT );
diff --git a/cpukit/rtems/src/ratemon.c b/cpukit/rtems/src/ratemon.c
index e12a590af4..9733620e06 100644
--- a/cpukit/rtems/src/ratemon.c
+++ b/cpukit/rtems/src/ratemon.c
@@ -277,8 +277,7 @@ rtems_status_code rtems_rate_monotonic_period(
             id,
             NULL
           );
-          _Watchdog_Insert_ticks(
-                     &the_period->Timer, length, WATCHDOG_ACTIVATE_NOW );
+          _Watchdog_Insert_ticks( &the_period->Timer, length );
           _Thread_Enable_dispatch();
           return RTEMS_SUCCESSFUL;
 
@@ -292,8 +291,7 @@ rtems_status_code rtems_rate_monotonic_period(
          /* has expired -- fall into next case */
         case RATE_MONOTONIC_EXPIRED:
           the_period->state = RATE_MONOTONIC_ACTIVE;
-          _Watchdog_Insert_ticks(
-                     &the_period->Timer, length, WATCHDOG_ACTIVATE_NOW );
+          _Watchdog_Insert_ticks( &the_period->Timer, length );
           _Thread_Enable_dispatch();
           return RTEMS_TIMEOUT;
       }
diff --git a/cpukit/rtems/src/rtemstimer.c b/cpukit/rtems/src/rtemstimer.c
index db37473500..6c3005ffbe 100644
--- a/cpukit/rtems/src/rtemstimer.c
+++ b/cpukit/rtems/src/rtemstimer.c
@@ -242,8 +242,7 @@ rtems_status_code rtems_timer_fire_after(
       (void) _Watchdog_Remove( &the_timer->Ticker );
       the_timer->the_class = TIMER_INTERVAL;
       _Watchdog_Initialize( &the_timer->Ticker, routine, id, user_data );
-      _Watchdog_Insert_ticks( &the_timer->Ticker,
-                                 ticks, WATCHDOG_ACTIVATE_NOW );
+      _Watchdog_Insert_ticks( &the_timer->Ticker, ticks );
       _Thread_Enable_dispatch();
       return RTEMS_SUCCESSFUL;
   }
@@ -298,8 +297,10 @@ rtems_status_code rtems_timer_fire_when(
       (void) _Watchdog_Remove( &the_timer->Ticker );
       the_timer->the_class = TIMER_TIME_OF_DAY;
       _Watchdog_Initialize( &the_timer->Ticker, routine, id, user_data );
-      _Watchdog_Insert_seconds( &the_timer->Ticker,
-                seconds - _TOD_Seconds_since_epoch, WATCHDOG_ACTIVATE_NOW );
+      _Watchdog_Insert_seconds(
+         &the_timer->Ticker,
+         seconds - _TOD_Seconds_since_epoch
+       );
       _Thread_Enable_dispatch();
       return RTEMS_SUCCESSFUL;
   }
diff --git a/cpukit/rtems/src/tasks.c b/cpukit/rtems/src/tasks.c
index 1e893b770b..99ec426dd6 100644
--- a/cpukit/rtems/src/tasks.c
+++ b/cpukit/rtems/src/tasks.c
@@ -987,8 +987,7 @@ rtems_status_code rtems_task_wake_after(
         _Thread_Executing->Object.id,
         NULL
       );
-      _Watchdog_Insert_ticks( &_Thread_Executing->Timer,
-                              ticks, WATCHDOG_ACTIVATE_NOW );
+      _Watchdog_Insert_ticks( &_Thread_Executing->Timer, ticks );
     _Thread_Enable_dispatch();
   }
   return RTEMS_SUCCESSFUL;
@@ -1036,8 +1035,10 @@ rtems_time_of_day *time_buffer
       _Thread_Executing->Object.id,
       NULL
     );
-    _Watchdog_Insert_seconds( &_Thread_Executing->Timer,
-            seconds - _TOD_Seconds_since_epoch, WATCHDOG_ACTIVATE_NOW );
+    _Watchdog_Insert_seconds(
+      &_Thread_Executing->Timer,
+      seconds - _TOD_Seconds_since_epoch
+    );
   _Thread_Enable_dispatch();
   return RTEMS_SUCCESSFUL;
 }
-- 
cgit v1.2.3