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/src | |
| 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/src')
| -rw-r--r-- | cpukit/score/src/coretodset.c | 2 | ||||
| -rw-r--r-- | cpukit/score/src/threadqenqueue.c | 4 | ||||
| -rw-r--r-- | cpukit/score/src/watchdogtick.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cpukit/score/src/coretodset.c b/cpukit/score/src/coretodset.c index 80b0b762bd..beda8c69b8 100644 --- a/cpukit/score/src/coretodset.c +++ b/cpukit/score/src/coretodset.c @@ -43,7 +43,7 @@ void _TOD_Set( for ( cpu_index = 0 ; cpu_index < cpu_count ; ++cpu_index ) { Per_CPU_Control *cpu = _Per_CPU_Get_by_index( cpu_index ); - _Watchdog_Per_CPU_tickle_absolute( cpu, tod_as_ticks ); + _Watchdog_Per_CPU_tickle_realtime( cpu, tod_as_ticks ); } _TOD.is_set = true; diff --git a/cpukit/score/src/threadqenqueue.c b/cpukit/score/src/threadqenqueue.c index 1f5a9c1660..df1bea02cb 100644 --- a/cpukit/score/src/threadqenqueue.c +++ b/cpukit/score/src/threadqenqueue.c @@ -385,7 +385,7 @@ static void _Thread_queue_Timeout( case WATCHDOG_RELATIVE: /* A relative timeout of 0 is a special case indefinite (no) timeout */ if ( queue_context->timeout != 0 ) { - _Thread_Timer_insert_relative( + _Thread_Timer_insert_monotonic( the_thread, cpu_self, _Thread_Timeout, @@ -394,7 +394,7 @@ static void _Thread_queue_Timeout( } break; case WATCHDOG_ABSOLUTE: - _Thread_Timer_insert_absolute( + _Thread_Timer_insert_realtime( the_thread, cpu_self, _Thread_Timeout, diff --git a/cpukit/score/src/watchdogtick.c b/cpukit/score/src/watchdogtick.c index ab7eadcf1d..e1c5a30f8a 100644 --- a/cpukit/score/src/watchdogtick.c +++ b/cpukit/score/src/watchdogtick.c @@ -76,14 +76,14 @@ void _Watchdog_Tick( Per_CPU_Control *cpu ) cpu->Watchdog.ticks = ticks; _Watchdog_Tickle( - &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_RELATIVE ], + &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_MONOTONIC ], ticks, &cpu->Watchdog.Lock, &lock_context ); _Timecounter_Getnanotime( &now ); - _Watchdog_Per_CPU_tickle_absolute( + _Watchdog_Per_CPU_tickle_realtime( cpu, _Watchdog_Ticks_from_timespec( &now ) ); |