From 3a4e044e6461a6f03edbae94ca6efd91d4c206de Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 22 Dec 2017 10:35:47 +0100 Subject: score: Rename _Watchdog_Realtime_from_*() Rename _Watchdog_Realtime_from_*() to _Watchdog_Ticks_from_*(). Update #3264. --- cpukit/score/src/coretodset.c | 2 +- cpukit/score/src/threadqtimeout.c | 4 ++-- cpukit/score/src/watchdogtick.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cpukit/score/src') diff --git a/cpukit/score/src/coretodset.c b/cpukit/score/src/coretodset.c index 787c263643..020b8878c0 100644 --- a/cpukit/score/src/coretodset.c +++ b/cpukit/score/src/coretodset.c @@ -37,7 +37,7 @@ void _TOD_Set( timespec2bintime( tod, &tod_as_bintime ); _Timecounter_Set_clock( &tod_as_bintime, lock_context ); - tod_as_ticks = _Watchdog_Realtime_from_timespec( tod ); + tod_as_ticks = _Watchdog_Ticks_from_timespec( tod ); cpu_count = _SMP_Get_processor_count(); for ( cpu_index = 0 ; cpu_index < cpu_count ; ++cpu_index ) { diff --git a/cpukit/score/src/threadqtimeout.c b/cpukit/score/src/threadqtimeout.c index 3f052fcf6f..691f643493 100644 --- a/cpukit/score/src/threadqtimeout.c +++ b/cpukit/score/src/threadqtimeout.c @@ -119,12 +119,12 @@ void _Thread_queue_Add_timeout_realtime_timespec( } else if ( _Watchdog_Is_far_future_realtime_timespec( abstime ) ) { expire = WATCHDOG_MAXIMUM_TICKS; } else { - expire = _Watchdog_Realtime_from_timespec( abstime ); + expire = _Watchdog_Ticks_from_timespec( abstime ); } _Timecounter_Getnanotime( &now ); - if ( expire > _Watchdog_Realtime_from_timespec( &now ) ) { + if ( expire > _Watchdog_Ticks_from_timespec( &now ) ) { ISR_lock_Context lock_context; _ISR_lock_ISR_disable_and_acquire( diff --git a/cpukit/score/src/watchdogtick.c b/cpukit/score/src/watchdogtick.c index 7a5863b824..e9160f2ea1 100644 --- a/cpukit/score/src/watchdogtick.c +++ b/cpukit/score/src/watchdogtick.c @@ -91,7 +91,7 @@ void _Watchdog_Tick( Per_CPU_Control *cpu ) _Watchdog_Tickle( header, first, - _Watchdog_Realtime_from_timespec( &now ), + _Watchdog_Ticks_from_timespec( &now ), &cpu->Watchdog.Lock, &lock_context ); -- cgit v1.2.3