diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-09-03 09:46:36 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-09-06 12:22:44 +0200 |
| commit | 54b4b1f85af465acb4627ec423599a6c3b4a6fad (patch) | |
| tree | f3bad4aa3f81fc8edee24fdb5c1138f39f128297 /cpukit/score/src/coretodset.c | |
| parent | score: Remove TOD_TICKS_PER_SECOND_method() (diff) | |
| download | rtems-54b4b1f85af465acb4627ec423599a6c3b4a6fad.tar.bz2 | |
score: Add _TOD_Is_valid_new_time_of_day()
Move the TOD validation to the callers of _TOD_Set(). This avoids dead code in
case only rtems_clock_set() is used in an application because rtems_clock_set()
always calls _TOD_Set() with a valid time of day.
Diffstat (limited to '')
| -rw-r--r-- | cpukit/score/src/coretodset.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/cpukit/score/src/coretodset.c b/cpukit/score/src/coretodset.c index 5fc01215e0..b04242a0da 100644 --- a/cpukit/score/src/coretodset.c +++ b/cpukit/score/src/coretodset.c @@ -23,25 +23,6 @@ #include <rtems/score/assert.h> #include <rtems/score/watchdogimpl.h> -static Status_Control _TOD_Check_time_of_day_and_run_hooks( - const struct timespec *tod -) -{ - if ( !_Watchdog_Is_valid_timespec( tod ) ) { - return STATUS_INVALID_NUMBER; - } - - if ( tod->tv_sec < TOD_SECONDS_1970_THROUGH_1988 ) { - return STATUS_INVALID_NUMBER; - } - - if ( _Watchdog_Is_far_future_timespec( tod ) ) { - return STATUS_INVALID_NUMBER; - } - - return _TOD_Hook_Run( TOD_ACTION_SET_CLOCK, tod ); -} - Status_Control _TOD_Set( const struct timespec *tod, ISR_lock_Context *lock_context @@ -54,8 +35,9 @@ Status_Control _TOD_Set( Status_Control status; _Assert( _TOD_Is_owner() ); + _Assert( _TOD_Is_valid_new_time_of_day( tod ) == STATUS_SUCCESSFUL ); - status = _TOD_Check_time_of_day_and_run_hooks( tod ); + status = _TOD_Hook_Run( TOD_ACTION_SET_CLOCK, tod ); if ( status != STATUS_SUCCESSFUL ) { _TOD_Release( lock_context ); return status; |