1 files changed, 28 insertions, 27 deletions

diff --git a/cpukit/score/src/coretodset.c b/cpukit/score/src/coretodset.c
index 5fc01215e0..99e21ba7e3 100644
--- a/cpukit/score/src/coretodset.c
+++ b/cpukit/score/src/coretodset.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /**
  * @file
  *
@@ -10,9 +12,26 @@
 /*  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -23,25 +42,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 +54,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;
@@ -70,13 +71,13 @@ Status_Control _TOD_Set(
   for ( cpu_index = 0 ; cpu_index < cpu_max ; ++cpu_index ) {
     Per_CPU_Control  *cpu;
     Watchdog_Header  *header;
-    ISR_lock_Context  lock_context;
+    ISR_lock_Context  lock_context_2;
     Watchdog_Control *first;
 
     cpu = _Per_CPU_Get_by_index( cpu_index );
     header = &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_REALTIME ];
 
-    _ISR_lock_ISR_disable_and_acquire( &cpu->Watchdog.Lock, &lock_context );
+    _ISR_lock_ISR_disable_and_acquire( &cpu->Watchdog.Lock, &lock_context_2 );
 
     first = _Watchdog_Header_first( header );
 
@@ -86,11 +87,11 @@ Status_Control _TOD_Set(
         first,
         tod_as_ticks,
         &cpu->Watchdog.Lock,
-        &lock_context
+        &lock_context_2
       );
     }
 
-    _ISR_lock_Release_and_ISR_enable( &cpu->Watchdog.Lock, &lock_context );
+    _ISR_lock_Release_and_ISR_enable( &cpu->Watchdog.Lock, &lock_context_2 );
   }
 
   _TOD.is_set = true;