diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-12-21 14:36:52 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-02-02 15:01:20 +0100 |
| commit | 9480815a222be61214b176836ef2b4ae4155ce84 (patch) | |
| tree | 63c96f9a0fb79ead01e6b73d12baaa5ac8cb8378 /cpukit/rtems | |
| parent | score: Rename _Watchdog_Realtime_from_*() (diff) | |
| download | rtems-9480815a222be61214b176836ef2b4ae4155ce84.tar.bz2 | |
score: Introduce new monotonic clock
Rename PER_CPU_WATCHDOG_MONOTONIC to PER_CPU_WATCHDOG_TICKS. Add new
PER_CPU_WATCHDOG_MONOTONIC which is based on the system uptime (measured
by timecounter).
Close #3264.
Diffstat (limited to 'cpukit/rtems')
| -rw-r--r-- | cpukit/rtems/src/ratemoncancel.c | 2 | ||||
| -rw-r--r-- | cpukit/rtems/src/timercreate.c | 2 | ||||
| -rw-r--r-- | cpukit/rtems/src/timerreset.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cpukit/rtems/src/ratemoncancel.c b/cpukit/rtems/src/ratemoncancel.c index 0a88310d09..ee556a3153 100644 --- a/cpukit/rtems/src/ratemoncancel.c +++ b/cpukit/rtems/src/ratemoncancel.c @@ -32,7 +32,7 @@ void _Rate_monotonic_Cancel( _Rate_monotonic_Acquire_critical( the_period, lock_context ); - _Watchdog_Per_CPU_remove_monotonic( &the_period->Timer ); + _Watchdog_Per_CPU_remove_ticks( &the_period->Timer ); the_period->state = RATE_MONOTONIC_INACTIVE; _Scheduler_Cancel_job( the_period->owner, diff --git a/cpukit/rtems/src/timercreate.c b/cpukit/rtems/src/timercreate.c index 444b07cfa5..0fff3d54cf 100644 --- a/cpukit/rtems/src/timercreate.c +++ b/cpukit/rtems/src/timercreate.c @@ -72,7 +72,7 @@ rtems_status_code _Timer_Fire( if ( _Timer_Is_interval_class( the_class ) ) { _Watchdog_Insert( - &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_MONOTONIC ], + &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_TICKS ], &the_timer->Ticker, cpu->Watchdog.ticks + interval ); diff --git a/cpukit/rtems/src/timerreset.c b/cpukit/rtems/src/timerreset.c index 3718fffa66..6357160cf3 100644 --- a/cpukit/rtems/src/timerreset.c +++ b/cpukit/rtems/src/timerreset.c @@ -37,7 +37,7 @@ rtems_status_code rtems_timer_reset( if ( _Timer_Is_interval_class( the_timer->the_class ) ) { _Timer_Cancel( cpu, the_timer ); _Watchdog_Insert( - &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_MONOTONIC ], + &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_TICKS ], &the_timer->Ticker, cpu->Watchdog.ticks + the_timer->initial ); |