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/watchdogimpl.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/watchdogimpl.h')
-rw-r--r-- | cpukit/score/include/rtems/score/watchdogimpl.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpukit/score/include/rtems/score/watchdogimpl.h b/cpukit/score/include/rtems/score/watchdogimpl.h index f6ad05cd8a..e248bcc061 100644 --- a/cpukit/score/include/rtems/score/watchdogimpl.h +++ b/cpukit/score/include/rtems/score/watchdogimpl.h @@ -351,7 +351,7 @@ RTEMS_INLINE_ROUTINE void _Watchdog_Per_CPU_release_critical( _ISR_lock_Release( &cpu->Watchdog.Lock, lock_context ); } -RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Per_CPU_insert_relative( +RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Per_CPU_insert_monotonic( Watchdog_Control *the_watchdog, Per_CPU_Control *cpu, Watchdog_Interval ticks @@ -361,7 +361,7 @@ RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Per_CPU_insert_relative( Watchdog_Header *header; uint64_t expire; - header = &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_RELATIVE ]; + header = &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_MONOTONIC ]; _Watchdog_Set_CPU( the_watchdog, cpu ); @@ -372,7 +372,7 @@ RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Per_CPU_insert_relative( return expire; } -RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Per_CPU_insert_absolute( +RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Per_CPU_insert_realtime( Watchdog_Control *the_watchdog, Per_CPU_Control *cpu, uint64_t expire @@ -381,7 +381,7 @@ RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Per_CPU_insert_absolute( ISR_lock_Context lock_context; Watchdog_Header *header; - header = &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_ABSOLUTE ]; + header = &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_REALTIME ]; _Watchdog_Set_CPU( the_watchdog, cpu ); @@ -407,7 +407,7 @@ RTEMS_INLINE_ROUTINE void _Watchdog_Per_CPU_remove( _Watchdog_Per_CPU_release_critical( cpu, &lock_context ); } -RTEMS_INLINE_ROUTINE void _Watchdog_Per_CPU_remove_relative( +RTEMS_INLINE_ROUTINE void _Watchdog_Per_CPU_remove_monotonic( Watchdog_Control *the_watchdog ) { @@ -417,11 +417,11 @@ RTEMS_INLINE_ROUTINE void _Watchdog_Per_CPU_remove_relative( _Watchdog_Per_CPU_remove( the_watchdog, cpu, - &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_RELATIVE ] + &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_MONOTONIC ] ); } -RTEMS_INLINE_ROUTINE void _Watchdog_Per_CPU_remove_absolute( +RTEMS_INLINE_ROUTINE void _Watchdog_Per_CPU_remove_realtime( Watchdog_Control *the_watchdog ) { @@ -431,11 +431,11 @@ RTEMS_INLINE_ROUTINE void _Watchdog_Per_CPU_remove_absolute( _Watchdog_Per_CPU_remove( the_watchdog, cpu, - &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_ABSOLUTE ] + &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_REALTIME ] ); } -RTEMS_INLINE_ROUTINE void _Watchdog_Per_CPU_tickle_absolute( +RTEMS_INLINE_ROUTINE void _Watchdog_Per_CPU_tickle_realtime( Per_CPU_Control *cpu, uint64_t now ) @@ -444,7 +444,7 @@ RTEMS_INLINE_ROUTINE void _Watchdog_Per_CPU_tickle_absolute( _ISR_lock_ISR_disable_and_acquire( &cpu->Watchdog.Lock, &lock_context ); _Watchdog_Tickle( - &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_ABSOLUTE ], + &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_REALTIME ], now, &cpu->Watchdog.Lock, &lock_context |