From 5e7b6272fc10068c22bfedb18a26a23a37e9a7ff Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 31 May 1996 23:27:45 +0000 Subject: renamed _TOD_Ticks_since_boot as _Watchdog_Ticks_since_boot so the Watchdog Handler could timestamp the starting and stopping of timers. Since TOD is built on top of Watchdog, this avoided a circular dependency. --- cpukit/score/include/rtems/score/tod.h | 7 ------- cpukit/score/include/rtems/score/watchdog.h | 9 +++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'cpukit/score/include') diff --git a/cpukit/score/include/rtems/score/tod.h b/cpukit/score/include/rtems/score/tod.h index a1fc6ee446..3788a74256 100644 --- a/cpukit/score/include/rtems/score/tod.h +++ b/cpukit/score/include/rtems/score/tod.h @@ -80,13 +80,6 @@ SCORE_EXTERN TOD_Control _TOD_Current; SCORE_EXTERN Watchdog_Interval _TOD_Seconds_since_epoch; -/* - * The following contains the number of ticks since the - * system was booted. - */ - -SCORE_EXTERN Watchdog_Interval _TOD_Ticks_since_boot; - /* * The following contains the number of microseconds per tick. */ diff --git a/cpukit/score/include/rtems/score/watchdog.h b/cpukit/score/include/rtems/score/watchdog.h index 8a43be1f1f..c77d9f1307 100644 --- a/cpukit/score/include/rtems/score/watchdog.h +++ b/cpukit/score/include/rtems/score/watchdog.h @@ -82,6 +82,8 @@ typedef struct { Watchdog_States state; Watchdog_Interval initial; Watchdog_Interval delta_interval; + Watchdog_Interval start_time; + Watchdog_Interval stop_time; Watchdog_Service_routine_entry routine; Objects_Id id; void *user_data; @@ -95,6 +97,13 @@ typedef struct { SCORE_EXTERN volatile unsigned32 _Watchdog_Sync_level; SCORE_EXTERN volatile unsigned32 _Watchdog_Sync_count; +/* + * The following contains the number of ticks since the + * system was booted. + */ + +SCORE_EXTERN Watchdog_Interval _Watchdog_Ticks_since_boot; + /* * The following defines the watchdog chains which are managed * on ticks and second boundaries. -- cgit v1.2.3