diff options
Diffstat (limited to 'cpukit/score/include')
-rw-r--r-- | cpukit/score/include/rtems/score/timestamp.h | 25 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/timestamp64.h | 30 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/tod.h | 9 |
3 files changed, 9 insertions, 55 deletions
diff --git a/cpukit/score/include/rtems/score/timestamp.h b/cpukit/score/include/rtems/score/timestamp.h index b86090978e..83948b46e1 100644 --- a/cpukit/score/include/rtems/score/timestamp.h +++ b/cpukit/score/include/rtems/score/timestamp.h @@ -194,31 +194,6 @@ extern "C" { #endif /** - * @brief Add to a Timestamp (At Clock Tick) - * - * This routine adds two timestamps. The second argument is added - * to the first. - * - * @node This routine places a special requirement on the addition - * operation. It must return the number of units that the - * seconds field changed as the result of the addition. Since this - * operation is ONLY used as part of processing a clock tick, - * it is generally safe to assume that only one second changed. - * - * @param[in] _time points to the base time to be added to - * @param[in] _add points to the timestamp to add to the first argument - * - * @return This method returns the number of seconds @a time increased by. - */ -#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE - #define _Timestamp_Add_to_at_tick( _time, _add ) \ - _Timespec_Add_to( _time, _add ) -#else - #define _Timestamp_Add_to_at_tick( _time, _add ) \ - _Timestamp64_Add_to_at_tick( _time, _add ) -#endif - -/** * @brief Convert Timestamp to Number of Ticks * * This routine convert the @a time timestamp to the corresponding number diff --git a/cpukit/score/include/rtems/score/timestamp64.h b/cpukit/score/include/rtems/score/timestamp64.h index 08d3ac7ecd..1c1ea2c90c 100644 --- a/cpukit/score/include/rtems/score/timestamp64.h +++ b/cpukit/score/include/rtems/score/timestamp64.h @@ -209,36 +209,6 @@ static inline void _Timestamp64_implementation_Add_to( #endif /** - * @brief Add to a Timestamp (At Clock Tick) - * - * This routine adds two timestamps. The second argument is added - * to the first. - * - * @node This routine places a special requirement on the addition - * operation. It must return the number of units that the - * seconds field changed as the result of the addition. Since this - * operation is ONLY used as part of processing a clock tick, - * it is generally safe to assume that only one second changed. - * - * @param[in] _time points to the base time to be added to - * @param[in] _add points to the timestamp to add to the first argument - * - * @return This method returns the number of seconds @a time increased by. - */ -static inline uint32_t _Timestamp64_Add_to_at_tick( - Timestamp64_Control *_time, - const Timestamp64_Control *_add -) -{ - Timestamp64_Control _start = *_time / 1000000000L; - *_time += *_add; - if ( ((*_time) / 1000000000L) != _start ) { - return 1; - } - return 0; -} - -/** * @brief Convert Timestamp to Number of Ticks * * This routine convert the @a time timestamp to the corresponding number diff --git a/cpukit/score/include/rtems/score/tod.h b/cpukit/score/include/rtems/score/tod.h index 06cc9003dd..cfb0fe776d 100644 --- a/cpukit/score/include/rtems/score/tod.h +++ b/cpukit/score/include/rtems/score/tod.h @@ -137,6 +137,15 @@ typedef struct { Timestamp_Control uptime; /** + * @brief Time of day seconds trigger. + * + * This value specifies the nanoseconds since the last time of day second. + * It is updated and evaluated in _TOD_Tickle_ticks(). It is set in + * _TOD_Set_with_timestamp(). + */ + uint32_t seconds_trigger; + + /** * @brief Indicates if the time of day is set. * * This is true if the application has set the current |