summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2017-12-22 10:35:47 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-02-02 15:01:20 +0100
commit3a4e044e6461a6f03edbae94ca6efd91d4c206de (patch)
treedbd5b256298abf7df1343aca622bb856ac811d00
parentscore: Optimize watchdog tickle (diff)
downloadrtems-3a4e044e6461a6f03edbae94ca6efd91d4c206de.tar.bz2
score: Rename _Watchdog_Realtime_from_*()
Rename _Watchdog_Realtime_from_*() to _Watchdog_Ticks_from_*(). Update #3264.
-rw-r--r--cpukit/include/rtems/score/watchdogimpl.h6
-rw-r--r--cpukit/rtems/src/taskwakewhen.c2
-rw-r--r--cpukit/rtems/src/timercreate.c2
-rw-r--r--cpukit/score/src/coretodset.c2
-rw-r--r--cpukit/score/src/threadqtimeout.c4
-rw-r--r--cpukit/score/src/watchdogtick.c2
6 files changed, 9 insertions, 9 deletions
diff --git a/cpukit/include/rtems/score/watchdogimpl.h b/cpukit/include/rtems/score/watchdogimpl.h
index f1693d9fda..9701fb772f 100644
--- a/cpukit/include/rtems/score/watchdogimpl.h
+++ b/cpukit/include/rtems/score/watchdogimpl.h
@@ -392,7 +392,7 @@ RTEMS_INLINE_ROUTINE bool _Watchdog_Is_far_future_realtime_timespec(
return ts->tv_sec > WATCHDOG_REALTIME_MAX_SECONDS;
}
-RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Realtime_from_seconds(
+RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Ticks_from_seconds(
uint32_t seconds
)
{
@@ -403,7 +403,7 @@ RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Realtime_from_seconds(
return ticks;
}
-RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Realtime_from_timespec(
+RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Ticks_from_timespec(
const struct timespec *ts
)
{
@@ -420,7 +420,7 @@ RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Realtime_from_timespec(
return ticks;
}
-RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Realtime_from_sbintime(
+RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Ticks_from_sbintime(
sbintime_t sbt
)
{
diff --git a/cpukit/rtems/src/taskwakewhen.c b/cpukit/rtems/src/taskwakewhen.c
index 228dd98052..ac92ea875e 100644
--- a/cpukit/rtems/src/taskwakewhen.c
+++ b/cpukit/rtems/src/taskwakewhen.c
@@ -56,7 +56,7 @@ rtems_status_code rtems_task_wake_when(
executing,
cpu_self,
_Thread_Timeout,
- _Watchdog_Realtime_from_seconds( seconds )
+ _Watchdog_Ticks_from_seconds( seconds )
);
_Thread_Dispatch_enable( cpu_self );
return RTEMS_SUCCESSFUL;
diff --git a/cpukit/rtems/src/timercreate.c b/cpukit/rtems/src/timercreate.c
index 42492c2f67..444b07cfa5 100644
--- a/cpukit/rtems/src/timercreate.c
+++ b/cpukit/rtems/src/timercreate.c
@@ -80,7 +80,7 @@ rtems_status_code _Timer_Fire(
_Watchdog_Insert(
&cpu->Watchdog.Header[ PER_CPU_WATCHDOG_REALTIME ],
&the_timer->Ticker,
- _Watchdog_Realtime_from_seconds( interval )
+ _Watchdog_Ticks_from_seconds( interval )
);
}
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
);