2011-09-29 Sebastian Huber <sebastian.huber@embedded-brains.de>

	* score/include/rtems/score/tod.h: Declare _TOD_Set_with_timestamp()
	and _TOD_Get_as_timestamp().
	* score/src/coretodset.c: Define _TOD_Set_with_timestamp().
	* score/src/coretodget.c: Define _TOD_Get_as_timestamp().
	* rtems/src/clockset.c: Use _TOD_Set_with_timestamp().
	* score/include/rtems/score/timestamp64.h, score/src/ts64set.c:
	Changed parameter types of _Timestamp64_Set().
	* rtems/src/clocktodtoseconds.c: Year 2100 is not a leap year.

2 files changed, 21 insertions, 10 deletions

diff --git a/cpukit/rtems/src/clockset.c b/cpukit/rtems/src/clockset.c
index b70e42e165..4c055d5b54 100644
--- a/cpukit/rtems/src/clockset.c
+++ b/cpukit/rtems/src/clockset.c
@@ -30,7 +30,7 @@
  *  This directive sets the date and time for this node.
  *
  *  Input parameters:
- *    time_buffer - pointer to the time and date structure
+ *    tod - pointer to the time and date structure
  *
  *  Output parameters:
  *    RTEMS_SUCCESSFUL - if successful
@@ -38,23 +38,26 @@
  */
 
 rtems_status_code rtems_clock_set(
-  const rtems_time_of_day *time_buffer
+  const rtems_time_of_day *tod
 )
 {
-  struct timespec  newtime;
-
-  if ( !time_buffer )
+  if ( !tod )
     return RTEMS_INVALID_ADDRESS;
 
-  if ( _TOD_Validate( time_buffer ) ) {
-    newtime.tv_sec = _TOD_To_seconds( time_buffer );
-    newtime.tv_nsec = time_buffer->ticks *
-      rtems_configuration_get_nanoseconds_per_tick();
+  if ( _TOD_Validate( tod ) ) {
+    Timestamp_Control tod_as_timestamp;
+    uint32_t seconds = _TOD_To_seconds( tod );
+    uint32_t nanoseconds = tod->ticks
+      * rtems_configuration_get_nanoseconds_per_tick();
+
+    _Timestamp_Set( &tod_as_timestamp, seconds, nanoseconds );
 
     _Thread_Disable_dispatch();
-      _TOD_Set( &newtime );
+      _TOD_Set_with_timestamp( &tod_as_timestamp );
     _Thread_Enable_dispatch();
+
     return RTEMS_SUCCESSFUL;
   }
+
   return RTEMS_INVALID_CLOCK;
 }
diff --git a/cpukit/rtems/src/clocktodtoseconds.c b/cpukit/rtems/src/clocktodtoseconds.c
index 7de1838b6e..7f867a4857 100644
--- a/cpukit/rtems/src/clocktodtoseconds.c
+++ b/cpukit/rtems/src/clocktodtoseconds.c
@@ -18,6 +18,8 @@
 #include <rtems/system.h>
 #include <rtems/rtems/clock.h>
 
+#define TOD_SECONDS_AT_2100_03_01_00_00 4107538800UL
+
 /*
  *  The following array contains the number of days in all months
  *  up to the month indicated by the index of the second dimension.
@@ -78,6 +80,12 @@ uint32_t   _TOD_To_seconds(
 
   time += the_tod->second;
 
+  /* The year 2100 is not a leap year */
+  if ( time
+      >= (TOD_SECONDS_AT_2100_03_01_00_00 - TOD_SECONDS_1970_THROUGH_1988)) {
+    time -= TOD_SECONDS_PER_DAY;
+  }
+
   time += TOD_SECONDS_1970_THROUGH_1988;
 
   return( time );