RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Rename _Watchdog_Realtime_from_*()

Browse Source 
Rename _Watchdog_Realtime_from_*() to _Watchdog_Ticks_from_*().

Update #3264.
This commit is contained in:
Sebastian Huber
2017-12-22 10:35:47 +01:00
parent 89c0313938
commit 3a4e044e64
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/include/rtems/score/watchdogimpl.h
View File

@@ -392,7 +392,7 @@ RTEMS_INLINE_ROUTINE bool _Watchdog_Is_far_future_realtime_timespec(
return ts->tv_sec > WATCHDOG_REALTIME_MAX_SECONDS; 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 uint32_t seconds
) )
{ {
@@ -403,7 +403,7 @@ RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Realtime_from_seconds(
return ticks; return ticks;
} }
RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Realtime_from_timespec( RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Ticks_from_timespec(
const struct timespec *ts const struct timespec *ts
) )
{ {
@@ -420,7 +420,7 @@ RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Realtime_from_timespec(
return ticks; return ticks;
} }
RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Realtime_from_sbintime( RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Ticks_from_sbintime(
sbintime_t sbt sbintime_t sbt
) )
{ {

2
cpukit/rtems/src/taskwakewhen.c
View File

@@ -56,7 +56,7 @@ rtems_status_code rtems_task_wake_when(
executing, executing,
cpu_self, cpu_self,
_Thread_Timeout, _Thread_Timeout,
_Watchdog_Realtime_from_seconds( seconds ) _Watchdog_Ticks_from_seconds( seconds )
); );
_Thread_Dispatch_enable( cpu_self ); _Thread_Dispatch_enable( cpu_self );
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;

2
cpukit/rtems/src/timercreate.c
View File

@@ -80,7 +80,7 @@ rtems_status_code _Timer_Fire(
_Watchdog_Insert( _Watchdog_Insert(
&cpu->Watchdog.Header[ PER_CPU_WATCHDOG_REALTIME ], &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_REALTIME ],
&the_timer->Ticker, &the_timer->Ticker,
_Watchdog_Realtime_from_seconds( interval ) _Watchdog_Ticks_from_seconds( interval )
); );
} }

2
cpukit/score/src/coretodset.c
View File

@@ -37,7 +37,7 @@ void _TOD_Set(
timespec2bintime( tod, &tod_as_bintime ); timespec2bintime( tod, &tod_as_bintime );
_Timecounter_Set_clock( &tod_as_bintime, lock_context ); _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(); cpu_count = _SMP_Get_processor_count();
for ( cpu_index = 0 ; cpu_index < cpu_count ; ++cpu_index ) { for ( cpu_index = 0 ; cpu_index < cpu_count ; ++cpu_index ) {

4
cpukit/score/src/threadqtimeout.c
View File

@@ -119,12 +119,12 @@ void _Thread_queue_Add_timeout_realtime_timespec(
} else if ( _Watchdog_Is_far_future_realtime_timespec( abstime ) ) { } else if ( _Watchdog_Is_far_future_realtime_timespec( abstime ) ) {
expire = WATCHDOG_MAXIMUM_TICKS; expire = WATCHDOG_MAXIMUM_TICKS;
} else { } else {
expire = _Watchdog_Realtime_from_timespec( abstime ); expire = _Watchdog_Ticks_from_timespec( abstime );
} }
_Timecounter_Getnanotime( &now ); _Timecounter_Getnanotime( &now );
if ( expire > _Watchdog_Realtime_from_timespec( &now ) ) { if ( expire > _Watchdog_Ticks_from_timespec( &now ) ) {
ISR_lock_Context lock_context; ISR_lock_Context lock_context;
_ISR_lock_ISR_disable_and_acquire( _ISR_lock_ISR_disable_and_acquire(

2
cpukit/score/src/watchdogtick.c
View File

@@ -91,7 +91,7 @@ void _Watchdog_Tick( Per_CPU_Control *cpu )
_Watchdog_Tickle( _Watchdog_Tickle(
header, header,
first, first,
_Watchdog_Realtime_from_timespec( &now ), _Watchdog_Ticks_from_timespec( &now ),
&cpu->Watchdog.Lock, &cpu->Watchdog.Lock,
&lock_context &lock_context
); );