Changeset 8d7aea0d in rtems

Timestamp:

09/29/11 09:55:54 (12 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

7cb170b3

Parents:

fe7cc1ea

Message:

2011-09-29 Sebastian Huber <sebastian.huber@…>

• 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.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• rtems/src/clockset.c (modified) (2 diffs)
• rtems/src/clocktodtoseconds.c (modified) (2 diffs)
• score/include/rtems/score/timestamp64.h (modified) (3 diffs)
• score/include/rtems/score/tod.h (modified) (1 diff)
• score/src/coretodget.c (modified) (2 diffs)
• score/src/coretodset.c (modified) (1 diff)
• score/src/ts64set.c (modified) (1 diff)

cpukit/ChangeLog

@@ +1 @@
+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.
+
 2011-09-28      Sebastian Huber <sebastian.huber@embedded-brains.de>
 

cpukit/rtems/src/clockset.c

@@ -31 +31 @@
  *
  *  Input parameters:
- *    time_buffer - pointer to the time and date structure
+ *    tod - pointer to the time and date structure
  *
  *  Output parameters:
@@ -39 +39 @@
 
 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;
 }

cpukit/rtems/src/clocktodtoseconds.c

@@ -18 +18 @@
 #include <rtems/system.h>
 #include <rtems/rtems/clock.h>
+
+#define TOD_SECONDS_AT_2100_03_01_00_00 4107538800UL
 
 /*
@@ -79 +81 @@
   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;
 

cpukit/score/include/rtems/score/timestamp64.h

@@ -56 +56 @@
 static inline void _Timestamp64_implementation_Set(
   Timestamp64_Control *_time,
-  long                 _seconds,
-  long                 _nanoseconds
-)
-{
-  Timestamp64_Control _seconds64 = _seconds;
-  Timestamp64_Control _nanoseconds64 = _nanoseconds;
-
-  *_time = _seconds64 * 1000000000L + _nanoseconds64;
+  Timestamp64_Control  _seconds,
+  Timestamp64_Control  _nanoseconds
+)
+{
+  *_time = _seconds * 1000000000L + _nanoseconds;
 }
 
@@ -82 +79 @@
   void _Timestamp64_Set(
     Timestamp64_Control *_time,
-    long                _seconds,
-    long                _nanoseconds
+    Timestamp64_Control  _seconds,
+    Timestamp64_Control  _nanoseconds
   );
 #endif
@@ -407 +404 @@
 )
 {
-  _timespec->tv_sec = *_timestamp / 1000000000L;
-  _timespec->tv_nsec = *_timestamp % 1000000000L;
+  _timespec->tv_sec = (time_t) (*_timestamp / 1000000000L);
+  _timespec->tv_nsec = (long) (*_timestamp % 1000000000L);
 }
 

cpukit/score/include/rtems/score/tod.h

@@ -164 +164 @@
 
 /**
- *  @brief _TOD_Set
- *
- *  This routine sets the current time of day to @a time and
- *  the equivalent SECONDS_SINCE_EPOCH.
- */
-void _TOD_Set(
-  const struct timespec *time
-);
-
-/**
- *  @brief _TOD_Get
- *
- *  This routine returns the current time of day with potential accuracy
- *  to the nanosecond.
- *
- *  @param[in] time is a pointer to the time to be returned
- */
-void _TOD_Get(
-  struct timespec *time
-);
+ *  @brief Sets the time of day according to @a tod_as_timestamp.
+ *
+ *  The @a tod_as_timestamp timestamp represents the time since UNIX epoch.  The watchdog
+ *  seconds chain will be adjusted.
+ */
+void _TOD_Set_with_timestamp(
+  const Timestamp_Control *tod_as_timestamp
+);
+
+static inline void _TOD_Set(
+  const struct timespec *tod_as_timespec
+)
+{
+  Timestamp_Control tod_as_timestamp;
+
+  _Timestamp_Set(
+    &tod_as_timestamp,
+    tod_as_timespec->tv_sec,
+    tod_as_timespec->tv_nsec
+  );
+  _TOD_Set_with_timestamp( &tod_as_timestamp );
+}
+
+/**
+ *  @brief Returns the time of day in @a tod_as_timestamp.
+ *
+ *  The @a tod_as_timestamp timestamp represents the time since UNIX epoch.
+ */
+void _TOD_Get_as_timestamp(
+  Timestamp_Control *tod_as_timestamp
+);
+
+static inline void _TOD_Get(
+  struct timespec *tod_as_timespec
+)
+{
+  Timestamp_Control tod_as_timestamp;
+
+  _TOD_Get_as_timestamp( &tod_as_timestamp );
+  _Timestamp_To_timespec( &tod_as_timestamp, tod_as_timespec );
+}
 
 /**

cpukit/score/src/coretodget.c

@@ -23 +23 @@
 #include <rtems/score/watchdog.h>
 
-/*
- *  _TOD_Get
- *
- *  This routine is used to obtain the current date and time.
- *
- *  Input parameters:
- *    time  - pointer to the time and date structure
- *
- *  Output parameters: NONE
- */
-
-void _TOD_Get(
-  struct timespec *time
+void _TOD_Get_as_timestamp(
+  Timestamp_Control *tod
 )
 {
@@ -53 +42 @@
   _Timestamp_Set( &offset, 0, nanoseconds );
   _Timestamp_Add_to( &now, &offset );
-  _Timestamp_To_timespec( &now, time );
+
+  *tod = now;
 }

cpukit/score/src/coretodset.c

@@ -24 +24 @@
 #include <rtems/score/watchdog.h>
 
-/*
- *  _TOD_Set
- *
- *  This rountine sets the current date and time with the specified
- *  new date and time structure.
- *
- *  Input parameters:
- *    time                - pointer to the time and date structure
- *
- *  Output parameters: NONE
- */
-
-void _TOD_Set(
-  const struct timespec *time
+void _TOD_Set_with_timestamp(
+  const Timestamp_Control *tod
 )
 {
-  long seconds;
+  Watchdog_Interval seconds_next = _Timestamp_Get_seconds( tod );
+  Watchdog_Interval seconds_now;
 
   _Thread_Disable_dispatch();
   _TOD_Deactivate();
 
-  seconds = _TOD_Seconds_since_epoch();
+  seconds_now = _TOD_Seconds_since_epoch();
 
-  if ( time->tv_sec < seconds )
-    _Watchdog_Adjust_seconds( WATCHDOG_BACKWARD, seconds - time->tv_sec );
+  if ( seconds_next < seconds_now )
+    _Watchdog_Adjust_seconds( WATCHDOG_BACKWARD, seconds_now - seconds_next );
   else
-    _Watchdog_Adjust_seconds( WATCHDOG_FORWARD, time->tv_sec - seconds );
+    _Watchdog_Adjust_seconds( WATCHDOG_FORWARD, seconds_next - seconds_now );
 
-  /* POSIX format TOD (timespec) */
-  _Timestamp_Set( &_TOD_Now, time->tv_sec, time->tv_nsec );
+  _TOD_Now = *tod;
   _TOD_Is_set = true;
 
   _TOD_Activate();
-
   _Thread_Enable_dispatch();
 }

cpukit/score/src/ts64set.c

@@ -23 +23 @@
 void _Timestamp64_Set(
   Timestamp64_Control *_time,
-  long                 _seconds,
-  long                 _nanoseconds
+  Timestamp64_Control  _seconds,
+  Timestamp64_Control  _nanoseconds
 )
 {