From bf2a53d272107b8b224b1a48694da24d2d042442 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Sat, 14 Oct 2017 15:14:53 +0200
Subject: score: Rename watchdog variants

Rename PER_CPU_WATCHDOG_RELATIVE in PER_CPU_WATCHDOG_MONOTONIC to
highlight the corresponding POSIX CLOCK_MONOTONIC.

Rename PER_CPU_WATCHDOG_ABSOLUTE in PER_CPU_WATCHDOG_REALTIME to
highlight the corresponding POSIX CLOCK_REALTIME.

Update #3117.
Update #3182.
---
 cpukit/score/src/coretodset.c     | 2 +-
 cpukit/score/src/threadqenqueue.c | 4 ++--
 cpukit/score/src/watchdogtick.c   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'cpukit/score/src')

diff --git a/cpukit/score/src/coretodset.c b/cpukit/score/src/coretodset.c
index 80b0b762bd..beda8c69b8 100644
--- a/cpukit/score/src/coretodset.c
+++ b/cpukit/score/src/coretodset.c
@@ -43,7 +43,7 @@ void _TOD_Set(
   for ( cpu_index = 0 ; cpu_index < cpu_count ; ++cpu_index ) {
     Per_CPU_Control *cpu = _Per_CPU_Get_by_index( cpu_index );
 
-    _Watchdog_Per_CPU_tickle_absolute( cpu, tod_as_ticks );
+    _Watchdog_Per_CPU_tickle_realtime( cpu, tod_as_ticks );
   }
 
   _TOD.is_set = true;
diff --git a/cpukit/score/src/threadqenqueue.c b/cpukit/score/src/threadqenqueue.c
index 1f5a9c1660..df1bea02cb 100644
--- a/cpukit/score/src/threadqenqueue.c
+++ b/cpukit/score/src/threadqenqueue.c
@@ -385,7 +385,7 @@ static void _Thread_queue_Timeout(
     case WATCHDOG_RELATIVE:
       /* A relative timeout of 0 is a special case indefinite (no) timeout */
       if ( queue_context->timeout != 0 ) {
-        _Thread_Timer_insert_relative(
+        _Thread_Timer_insert_monotonic(
           the_thread,
           cpu_self,
           _Thread_Timeout,
@@ -394,7 +394,7 @@ static void _Thread_queue_Timeout(
       }
       break;
     case WATCHDOG_ABSOLUTE:
-      _Thread_Timer_insert_absolute(
+      _Thread_Timer_insert_realtime(
         the_thread,
         cpu_self,
         _Thread_Timeout,
diff --git a/cpukit/score/src/watchdogtick.c b/cpukit/score/src/watchdogtick.c
index ab7eadcf1d..e1c5a30f8a 100644
--- a/cpukit/score/src/watchdogtick.c
+++ b/cpukit/score/src/watchdogtick.c
@@ -76,14 +76,14 @@ void _Watchdog_Tick( Per_CPU_Control *cpu )
   cpu->Watchdog.ticks = ticks;
 
   _Watchdog_Tickle(
-    &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_RELATIVE ],
+    &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_MONOTONIC ],
     ticks,
     &cpu->Watchdog.Lock,
     &lock_context
   );
 
   _Timecounter_Getnanotime( &now );
-  _Watchdog_Per_CPU_tickle_absolute(
+  _Watchdog_Per_CPU_tickle_realtime(
     cpu,
     _Watchdog_Ticks_from_timespec( &now )
   );
-- 
cgit v1.2.3