diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-14 15:14:53 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-17 08:15:40 +0200 |
| commit | bf2a53d272107b8b224b1a48694da24d2d042442 (patch) | |
| tree | 397d8f4917dcf8ca017aff215bdcf1d5de786f84 /cpukit/score/include/rtems/score/threadimpl.h | |
| parent | bsp/tms570: remove duplicate of TMS570_SCI_FLR_TX_EMPTY in console driver. (diff) | |
| download | rtems-bf2a53d272107b8b224b1a48694da24d2d042442.tar.bz2 | |
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.
Diffstat (limited to 'cpukit/score/include/rtems/score/threadimpl.h')
| -rw-r--r-- | cpukit/score/include/rtems/score/threadimpl.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpukit/score/include/rtems/score/threadimpl.h b/cpukit/score/include/rtems/score/threadimpl.h index 60c7759e09..67de07e5a2 100644 --- a/cpukit/score/include/rtems/score/threadimpl.h +++ b/cpukit/score/include/rtems/score/threadimpl.h @@ -1853,11 +1853,11 @@ RTEMS_INLINE_ROUTINE void _Thread_Timer_initialize( ) { _ISR_lock_Initialize( &timer->Lock, "Thread Timer" ); - timer->header = &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_RELATIVE ]; + timer->header = &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_MONOTONIC ]; _Watchdog_Preinitialize( &timer->Watchdog, cpu ); } -RTEMS_INLINE_ROUTINE void _Thread_Timer_insert_relative( +RTEMS_INLINE_ROUTINE void _Thread_Timer_insert_monotonic( Thread_Control *the_thread, Per_CPU_Control *cpu, Watchdog_Service_routine_entry routine, @@ -1869,14 +1869,14 @@ RTEMS_INLINE_ROUTINE void _Thread_Timer_insert_relative( _ISR_lock_ISR_disable_and_acquire( &the_thread->Timer.Lock, &lock_context ); the_thread->Timer.header = - &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_RELATIVE ]; + &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_MONOTONIC ]; the_thread->Timer.Watchdog.routine = routine; - _Watchdog_Per_CPU_insert_relative( &the_thread->Timer.Watchdog, cpu, ticks ); + _Watchdog_Per_CPU_insert_monotonic( &the_thread->Timer.Watchdog, cpu, ticks ); _ISR_lock_Release_and_ISR_enable( &the_thread->Timer.Lock, &lock_context ); } -RTEMS_INLINE_ROUTINE void _Thread_Timer_insert_absolute( +RTEMS_INLINE_ROUTINE void _Thread_Timer_insert_realtime( Thread_Control *the_thread, Per_CPU_Control *cpu, Watchdog_Service_routine_entry routine, @@ -1888,9 +1888,9 @@ RTEMS_INLINE_ROUTINE void _Thread_Timer_insert_absolute( _ISR_lock_ISR_disable_and_acquire( &the_thread->Timer.Lock, &lock_context ); the_thread->Timer.header = - &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_ABSOLUTE ]; + &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_REALTIME ]; the_thread->Timer.Watchdog.routine = routine; - _Watchdog_Per_CPU_insert_absolute( &the_thread->Timer.Watchdog, cpu, expire ); + _Watchdog_Per_CPU_insert_realtime( &the_thread->Timer.Watchdog, cpu, expire ); _ISR_lock_Release_and_ISR_enable( &the_thread->Timer.Lock, &lock_context ); } |