<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2011-09-28)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-09-28 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1914/cpukit
* score/src/timespecgreaterthan.c, score/src/ts64greaterthan.c:
Removed files.
* score/Makefile.am: Reflect changes above.
* score/include/rtems/score/timespec.h,
score/include/rtems/score/timestamp.h,
score/include/rtems/score/timestamp64.h, score/src/ts64addto.c,
score/src/ts64divide.c, score/src/ts64dividebyinteger.c,
score/src/ts64equalto.c, score/src/ts64getnanoseconds.c,
score/src/ts64getseconds.c, score/src/ts64lessthan.c,
score/src/ts64set.c, score/src/ts64settozero.c,
score/src/ts64subtract.c, score/src/ts64toticks.c,
score/src/ts64totimespec.c: Use CPU_TIMESTAMP_USE_STRUCT_TIMESPEC,
CPU_TIMESTAMP_USE_INT64, and CPU_TIMESTAMP_USE_INT64_INLINE. Removed
copy and paste.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2926&r2=text&tr2=1.2927&diff_format=h">M</a></td><td width='1%'>1.2927</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/Makefile.am.diff?r1=text&tr1=1.110&r2=text&tr2=1.111&diff_format=h">M</a></td><td width='1%'>1.111</td><td width='100%'>cpukit/score/Makefile.am</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/timespec.h.diff?r1=text&tr1=1.12&r2=text&tr2=1.13&diff_format=h">M</a></td><td width='1%'>1.13</td><td width='100%'>cpukit/score/include/rtems/score/timespec.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/timestamp.h.diff?r1=text&tr1=1.7&r2=text&tr2=1.8&diff_format=h">M</a></td><td width='1%'>1.8</td><td width='100%'>cpukit/score/include/rtems/score/timestamp.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/timestamp64.h.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>cpukit/score/include/rtems/score/timestamp64.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/timespecgreaterthan.c?rev=1.4&content-type=text/vnd.viewcvs-markup">R</a></td><td width='1%'><font color="#880000">1.4</font></td><td width='100%'><font color="#880000">cpukit/score/src/timespecgreaterthan.c</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/ts64addto.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>cpukit/score/src/ts64addto.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/ts64divide.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&diff_format=h">M</a></td><td width='1%'>1.4</td><td width='100%'>cpukit/score/src/ts64divide.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/ts64dividebyinteger.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>cpukit/score/src/ts64dividebyinteger.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/ts64equalto.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>cpukit/score/src/ts64equalto.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/ts64getnanoseconds.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=h">M</a></td><td width='1%'>1.3</td><td width='100%'>cpukit/score/src/ts64getnanoseconds.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/ts64getseconds.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>cpukit/score/src/ts64getseconds.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/ts64greaterthan.c?rev=1.1&content-type=text/vnd.viewcvs-markup">R</a></td><td width='1%'><font color="#880000">1.1</font></td><td width='100%'><font color="#880000">cpukit/score/src/ts64greaterthan.c</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/ts64lessthan.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>cpukit/score/src/ts64lessthan.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/ts64set.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>cpukit/score/src/ts64set.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/ts64settozero.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>cpukit/score/src/ts64settozero.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/ts64subtract.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>cpukit/score/src/ts64subtract.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/ts64toticks.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&diff_format=h">M</a></td><td width='1%'>1.4</td><td width='100%'>cpukit/score/src/ts64toticks.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/ts64totimespec.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>cpukit/score/src/ts64totimespec.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2926 rtems/cpukit/ChangeLog:1.2927
--- rtems/cpukit/ChangeLog:1.2926 Mon Sep 26 19:58:42 2011
+++ rtems/cpukit/ChangeLog Wed Sep 28 09:42:11 2011
</font><font color='#997700'>@@ -1,3 +1,21 @@
</font><font color='#000088'>+2011-09-28 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ PR 1914/cpukit
+ * score/src/timespecgreaterthan.c, score/src/ts64greaterthan.c:
+ Removed files.
+ * score/Makefile.am: Reflect changes above.
+ * score/include/rtems/score/timespec.h,
+ score/include/rtems/score/timestamp.h,
+ score/include/rtems/score/timestamp64.h, score/src/ts64addto.c,
+ score/src/ts64divide.c, score/src/ts64dividebyinteger.c,
+ score/src/ts64equalto.c, score/src/ts64getnanoseconds.c,
+ score/src/ts64getseconds.c, score/src/ts64lessthan.c,
+ score/src/ts64set.c, score/src/ts64settozero.c,
+ score/src/ts64subtract.c, score/src/ts64toticks.c,
+ score/src/ts64totimespec.c: Use CPU_TIMESTAMP_USE_STRUCT_TIMESPEC,
+ CPU_TIMESTAMP_USE_INT64, and CPU_TIMESTAMP_USE_INT64_INLINE. Removed
+ copy and paste.
+
</font> 2011-09-26 Petr Benes <benesp16@fel.cvut.cz>
PR 1923/testing
<font color='#006600'>diff -u rtems/cpukit/score/Makefile.am:1.110 rtems/cpukit/score/Makefile.am:1.111
--- rtems/cpukit/score/Makefile.am:1.110 Thu Sep 15 10:49:31 2011
+++ rtems/cpukit/score/Makefile.am Wed Sep 28 09:42:11 2011
</font><font color='#997700'>@@ -295,7 +295,7 @@
</font>
## TIMESPEC_C_FILES
libscore_a_SOURCES += src/timespecaddto.c src/timespecfromticks.c \
<font color='#880000'>- src/timespecisvalid.c src/timespeclessthan.c src/timespecgreaterthan.c \
</font><font color='#000088'>+ src/timespecisvalid.c src/timespeclessthan.c \
</font> src/timespecsubtract.c src/timespectoticks.c src/timespecdivide.c \
src/timespecdividebyinteger.c
<font color='#997700'>@@ -303,7 +303,7 @@
</font> libscore_a_SOURCES += src/ts64addto.c src/ts64dividebyinteger.c \
src/ts64divide.c src/ts64equalto.c \
src/ts64getnanoseconds.c src/ts64getseconds.c \
<font color='#880000'>- src/ts64greaterthan.c src/ts64lessthan.c \
</font><font color='#000088'>+ src/ts64lessthan.c \
</font> src/ts64set.c src/ts64settozero.c src/ts64subtract.c \
src/ts64toticks.c src/ts64totimespec.c
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/timespec.h:1.12 rtems/cpukit/score/include/rtems/score/timespec.h:1.13
--- rtems/cpukit/score/include/rtems/score/timespec.h:1.12 Fri Jun 17 10:40:09 2011
+++ rtems/cpukit/score/include/rtems/score/timespec.h Wed Sep 28 09:42:11 2011
</font><font color='#997700'>@@ -131,10 +131,8 @@
</font> * @return This method returns true if @a lhs is greater than the @a rhs and
* false otherwise.
*/
<font color='#880000'>-bool _Timespec_Greater_than(
- const struct timespec *lhs,
- const struct timespec *rhs
-);
</font><font color='#000088'>+#define _Timespec_Greater_than( _lhs, _rhs ) \
+ _Timespec_Less_than( _rhs, _lhs )
</font>
/**
* @brief Timespec equal to Operator
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/timestamp.h:1.7 rtems/cpukit/score/include/rtems/score/timestamp.h:1.8
--- rtems/cpukit/score/include/rtems/score/timestamp.h:1.7 Fri Jun 17 10:40:09 2011
+++ rtems/cpukit/score/include/rtems/score/timestamp.h Wed Sep 28 09:42:11 2011
</font><font color='#997700'>@@ -40,93 +40,33 @@
</font> */
/**@{*/
<font color='#000088'>+#include <rtems/score/cpu.h>
</font> #include <rtems/score/timespec.h>
#ifdef __cplusplus
extern "C" {
#endif
<font color='#880000'>-/*
- * NOTE: Eventually each port should select what it should use!!!
- *
- * These control which implementation of SuperCore Timestamp is used.
- *
- * if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
- * struct timespec is used
- * else if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64)
- * int64_t is used
- *
- * When int64_t is used, then
- * if defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
- * the methods are inlined
- * else
- * the methods are NOT inlined
- *
- * Performance of int64_t versus struct timespec
- * =============================================
- *
- * On PowerPC/psim, inlined int64_t saves ~50 instructions on each
- * _Thread_Dispatch operation which results in a context switch.
- * This works out to be about 10% faster dispatches and 7.5% faster
- * blocking semaphore obtains. The following numbers are in instructions
- * and from tm02 and tm26.
- *
- * timespec int64 inlined int64
- * dispatch: 446 446 400
- * blocking sem obtain: 627 626 581
- *
- * On SPARC/sis, inlined int64_t shows the same percentage gains.
- * The following numbers are in microseconds and from tm02 and tm26.
- *
- * timespec int64 inlined int64
- * dispatch: 59 61 53
- * blocking sem obtain: 98 100 92
- *
- * Inlining appears to have a tendency to increase the size of
- * some executables.
- * Not inlining reduces the execution improvement but does not seem to
- * be an improvement on the PowerPC and SPARC. The struct timespec
- * and the executables with int64 not inlined are about the same size.
- *
- * Once there has some analysis of which algorithm and configuration
- * is best suited to each target, these defines should be moved to
- * the appropriate score/cpu cpu.h file. In the meantime, it is
- * appropriate to select an implementation here using CPU macros.
- */
-
-#define CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC
-/*
-#define CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64
-#define CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE
-*/
-
-/*
- * Verify something is defined.
- */
-#if !defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC) && \
- !defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64)
- #error "No SuperCore Timestamp implementation selected."
-#endif
-
-/*
- * Verify that more than one is not defined.
- */
-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC) && \
- defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64)
- #error "Too many SuperCore Timestamp implementations selected."
</font><font color='#000088'>+#if ! ( ( CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE \
+ && CPU_TIMESTAMP_USE_INT64 == FALSE \
+ && CPU_TIMESTAMP_USE_INT64_INLINE == FALSE ) \
+ || ( CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == FALSE \
+ && CPU_TIMESTAMP_USE_INT64 == TRUE \
+ && CPU_TIMESTAMP_USE_INT64_INLINE == FALSE ) \
+ || ( CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == FALSE \
+ && CPU_TIMESTAMP_USE_INT64 == FALSE \
+ && CPU_TIMESTAMP_USE_INT64_INLINE == TRUE ) )
+ #error "Invalid SuperCore Timestamp implementations selection."
</font> #endif
<font color='#880000'>-/**
- * Include any implementation specific header files
- */
-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64 == TRUE || CPU_TIMESTAMP_USE_INT64_INLINE == TRUE
</font> #include <rtems/score/timestamp64.h>
#endif
/**
* Define the Timestamp control type.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> typedef struct timespec Timestamp_Control;
#else
typedef Timestamp64_Control Timestamp_Control;
<font color='#997700'>@@ -142,7 +82,7 @@
</font> * @param[in] _seconds is the seconds portion of the timestamp
* @param[in] _nanoseconds is the nanoseconds portion of the timestamp
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> #define _Timestamp_Set( _time, _seconds, _nanoseconds ) \
_Timespec_Set( _time, _seconds, _nanoseconds )
#else
<font color='#997700'>@@ -158,7 +98,7 @@
</font> *
* @param[in] _time points to the timestamp instance to zero.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> #define _Timestamp_Set_to_zero( _time ) \
_Timespec_Set_to_zero( _time )
#else
<font color='#997700'>@@ -176,7 +116,7 @@
</font> * @return This method returns true if @a time is valid and
* false otherwise.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> #define _Timestamp_Is_valid( _time ) \
_Timespec_Is_valid( _time )
#else
<font color='#997700'>@@ -195,7 +135,7 @@
</font> * @return This method returns true if @a _lhs is less than the @a _rhs and
* false otherwise.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> #define _Timestamp_Less_than( _lhs, _rhs ) \
_Timespec_Less_than( _lhs, _rhs )
#else
<font color='#997700'>@@ -214,13 +154,8 @@
</font> * @return This method returns true if @a _lhs is greater than the @a _rhs and
* false otherwise.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
- #define _Timestamp_Greater_than( _lhs, _rhs ) \
- _Timespec_Greater_than( _lhs, _rhs )
-#else
- #define _Timestamp_Greater_than( _lhs, _rhs ) \
- _Timestamp64_Greater_than( _lhs, _rhs )
-#endif
</font><font color='#000088'>+#define _Timestamp_Greater_than( _lhs, _rhs ) \
+ _Timestamp_Less_than( _rhs, _lhs )
</font>
/**
* @brief Timestamp equal to Operator
<font color='#997700'>@@ -233,7 +168,7 @@
</font> * @return This method returns true if @a _lhs is equal to @a _rhs and
* false otherwise.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> #define _Timestamp_Equal_to( _lhs, _rhs ) \
_Timespec_Equal_to( _lhs, _rhs )
#else
<font color='#997700'>@@ -252,7 +187,7 @@
</font> *
* @return This method returns the number of seconds @a time increased by.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> #define _Timestamp_Add_to( _time, _add ) \
_Timespec_Add_to( _time, _add )
#else
<font color='#997700'>@@ -277,7 +212,7 @@
</font> *
* @return This method returns the number of seconds @a time increased by.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> #define _Timestamp_Add_to_at_tick( _time, _add ) \
_Timespec_Add_to( _time, _add )
#else
<font color='#997700'>@@ -295,7 +230,7 @@
</font> *
* @return This method returns the number of ticks computed.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> #define _Timestamp_To_ticks( _time ) \
_Timespec_To_ticks( _time )
#else
<font color='#997700'>@@ -312,7 +247,7 @@
</font> * @param[in] _time points to the timestamp format time result
* @param[in] _ticks points to the number of ticks to be filled in
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> #define _Timestamp_From_ticks( _ticks, _time ) \
_Timespec_From_ticks( _ticks, _time )
#else
<font color='#997700'>@@ -333,7 +268,7 @@
</font> *
* @return This method fills in @a _result.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> #define _Timestamp_Subtract( _start, _end, _result ) \
_Timespec_Subtract( _start, _end, _result )
#else
<font color='#997700'>@@ -354,7 +289,7 @@
</font> *
* @return This method fills in @a result.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> #define _Timestamp_Divide_by_integer( _time, _iterations, _result ) \
_Timespec_Divide_by_integer(_time, _iterations, _result )
#else
<font color='#997700'>@@ -375,7 +310,7 @@
</font> *
* @return This method fills in @a result.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> #define _Timestamp_Divide( _lhs, _rhs, _ival_percentage, _fval_percentage ) \
_Timespec_Divide( _lhs, _rhs, _ival_percentage, _fval_percentage )
#else
<font color='#997700'>@@ -392,7 +327,7 @@
</font> *
* @return The seconds portion of @a _time.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> #define _Timestamp_Get_seconds( _time ) \
_Timespec_Get_seconds( _time )
#else
<font color='#997700'>@@ -409,7 +344,7 @@
</font> *
* @return The nanoseconds portion of @a _time.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> #define _Timestamp_Get_nanoseconds( _time ) \
_Timespec_Get_nanoseconds( _time )
#else
<font color='#997700'>@@ -425,7 +360,7 @@
</font> * @param[in] _timestamp points to the timestamp
* @param[in] _timespec points to the timespec
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_STRUCT_SPEC)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE
</font> /* in this case we know they are the same type so use simple assignment */
#define _Timestamp_To_timespec( _timestamp, _timespec ) \
*(_timespec) = *(_timestamp)
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/timestamp64.h:1.5 rtems/cpukit/score/include/rtems/score/timestamp64.h:1.6
--- rtems/cpukit/score/include/rtems/score/timestamp64.h:1.5 Fri Jun 17 10:40:09 2011
+++ rtems/cpukit/score/include/rtems/score/timestamp64.h Wed Sep 28 09:42:12 2011
</font><font color='#997700'>@@ -44,7 +44,7 @@
</font> /*
* Verify something is defined.
*/
<font color='#880000'>-#if !defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64 != TRUE && CPU_TIMESTAMP_USE_INT64_INLINE != TRUE
</font> #error "SuperCore Timestamp64 implementation included but not defined."
#endif
<font color='#997700'>@@ -53,6 +53,18 @@
</font> */
typedef int64_t Timestamp64_Control;
<font color='#000088'>+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;
+}
+
</font> /**
* @brief Set Timestamp to Seconds Nanosecond
*
<font color='#997700'>@@ -63,12 +75,9 @@
</font> * @param[in] _seconds is the seconds portion of the timestamp
* @param[in] _nanoseconds is the nanoseconds portion of the timestamp
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64_INLINE == TRUE
</font> #define _Timestamp64_Set( _time, _seconds, _nanoseconds ) \
<font color='#880000'>- do { \
- *(_time) = ((int64_t)_seconds * 1000000000); \
- *(_time) += (int64_t)(_nanoseconds); \
- } while (0)
</font><font color='#000088'>+ _Timestamp64_implementation_Set( _time, _seconds, _nanoseconds )
</font> #else
void _Timestamp64_Set(
Timestamp64_Control *_time,
<font color='#997700'>@@ -77,6 +86,13 @@
</font> );
#endif
<font color='#000088'>+static inline void _Timestamp64_implementation_Set_to_zero(
+ Timestamp64_Control *_time
+)
+{
+ *_time = 0;
+}
+
</font> /**
* @brief Zero Timestamp
*
<font color='#997700'>@@ -85,9 +101,9 @@
</font> *
* @param[in] _time points to the timestamp instance to zero.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64_INLINE == TRUE
</font> #define _Timestamp64_Set_to_zero( _time ) \
<font color='#880000'>- *(_time) = 0
</font><font color='#000088'>+ _Timestamp64_implementation_Set_to_zero( _time )
</font> #else
void _Timestamp64_Set_to_zero(
Timestamp64_Control *_time
<font color='#997700'>@@ -105,7 +121,15 @@
</font> * false otherwise.
*/
#define _Timestamp64_Is_valid( _time ) \
<font color='#880000'>- (1)
</font><font color='#000088'>+ (1)
+
+static inline bool _Timestamp64_implementation_Less_than(
+ const Timestamp64_Control *_lhs,
+ const Timestamp64_Control *_rhs
+)
+{
+ return *_lhs < *_rhs;
+}
</font>
/**
* @brief Timestamp Less Than Operator
<font color='#997700'>@@ -118,36 +142,26 @@
</font> * @return This method returns true if @a _lhs is less than the @a _rhs and
* false otherwise.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64_INLINE == TRUE
</font> #define _Timestamp64_Less_than( _lhs, _rhs ) \
<font color='#880000'>- (*(_lhs) < *(_rhs))
</font><font color='#000088'>+ _Timestamp64_implementation_Less_than( _lhs, _rhs )
</font> #else
bool _Timestamp64_Less_than(
<font color='#880000'>- Timestamp64_Control *_lhs,
- Timestamp64_Control *_rhs
</font><font color='#000088'>+ const Timestamp64_Control *_lhs,
+ const Timestamp64_Control *_rhs
</font> );
#endif
<font color='#880000'>-/**
- * @brief Timestamp Greater Than Operator
- *
- * This method is the greater than operator for timestamps.
- *
- * @param[in] _lhs points to the left hand side timestamp
- * @param[in] _rhs points to the right hand side timestamp
- *
- * @return This method returns true if @a _lhs is greater than the @a _rhs and
- * false otherwise.
- */
-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
- #define _Timestamp64_Greater_than( _lhs, _rhs ) \
- (*(_lhs) > *(_rhs))
-#else
- bool _Timestamp64_Greater_than(
- Timestamp64_Control *_lhs,
- Timestamp64_Control *_rhs
- );
-#endif
</font><font color='#000088'>+static inline bool _Timestamp64_implementation_Equal_to(
+ const Timestamp64_Control *_lhs,
+ const Timestamp64_Control *_rhs
+)
+{
+ return *_lhs == *_rhs;
+}
+
+#define _Timestamp64_Greater_than( _lhs, _rhs ) \
+ _Timestamp64_Less_than( _rhs, _lhs )
</font>
/**
* @brief Timestamp equal to Operator
<font color='#997700'>@@ -160,16 +174,24 @@
</font> * @return This method returns true if @a _lhs is equal to @a _rhs and
* false otherwise.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64_INLINE == TRUE
</font> #define _Timestamp64_Equal_to( _lhs, _rhs ) \
<font color='#880000'>- (*(_lhs) == *(_rhs))
</font><font color='#000088'>+ _Timestamp64_implementation_Equal_to( _lhs, _rhs )
</font> #else
bool _Timestamp64_Equal_to(
<font color='#880000'>- Timestamp64_Control *_lhs,
- Timestamp64_Control *_rhs
</font><font color='#000088'>+ const Timestamp64_Control *_lhs,
+ const Timestamp64_Control *_rhs
</font> );
#endif
<font color='#000088'>+static inline void _Timestamp64_implementation_Add_to(
+ Timestamp64_Control *_time,
+ const Timestamp64_Control *_add
+)
+{
+ *_time += *_add;
+}
+
</font> /**
* @brief Add to a Timestamp
*
<font color='#997700'>@@ -181,13 +203,13 @@
</font> *
* @return This method returns the number of seconds @a time increased by.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64_INLINE == TRUE
</font> #define _Timestamp64_Add_to( _time, _add ) \
<font color='#880000'>- *(_time) += *(_add)
</font><font color='#000088'>+ _Timestamp64_implementation_Add_to( _time, _add )
</font> #else
void _Timestamp64_Add_to(
<font color='#880000'>- Timestamp64_Control *_time,
- Timestamp64_Control *_add
</font><font color='#000088'>+ Timestamp64_Control *_time,
+ const Timestamp64_Control *_add
</font> );
#endif
<font color='#997700'>@@ -210,12 +232,12 @@
</font> */
static inline uint32_t _Timestamp64_Add_to_at_tick(
Timestamp64_Control *_time,
<font color='#880000'>- Timestamp64_Control *_add
</font><font color='#000088'>+ const Timestamp64_Control *_add
</font> )
{
<font color='#880000'>- Timestamp64_Control start = *_time / 1000000000;
</font><font color='#000088'>+ Timestamp64_Control _start = *_time / 1000000000L;
</font> *_time += *_add;
<font color='#880000'>- if ( ((*_time) / 1000000000) != start ) {
</font><font color='#000088'>+ if ( ((*_time) / 1000000000L) != _start ) {
</font> return 1;
}
return 0;
<font color='#997700'>@@ -242,13 +264,22 @@
</font> * timestamp format @a _time.
*
* @param[in] _time points to the timestamp format time result
<font color='#880000'>- * @param[in] _ticks points to the number of ticks to be filled in
</font><font color='#000088'>+ * @param[out] _ticks points to the number of ticks to be filled in
</font> */
void _Timestamp64_From_ticks(
uint32_t _ticks,
Timestamp64_Control *_time
);
<font color='#000088'>+static inline void _Timestamp64_implementation_Subtract(
+ const Timestamp64_Control *_start,
+ const Timestamp64_Control *_end,
+ Timestamp64_Control *_result
+)
+{
+ *_result = *_end - *_start;
+}
+
</font> /**
* @brief Subtract Two Timestamp
*
<font color='#997700'>@@ -257,24 +288,29 @@
</font> *
* @param[in] _start points to the starting time
* @param[in] _end points to the ending time
<font color='#880000'>- * @param[in] _result points to the difference between
</font><font color='#000088'>+ * @param[out] _result points to the difference between
</font> * starting and ending time.
<font color='#880000'>- *
- * @return This method fills in @a _result.
</font> */
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64_INLINE == TRUE
</font> #define _Timestamp64_Subtract( _start, _end, _result ) \
<font color='#880000'>- do { \
- *(_result) = *(_end) - *(_start); \
- } while (0)
</font><font color='#000088'>+ _Timestamp64_implementation_Subtract( _start, _end, _result )
</font> #else
void _Timestamp64_Subtract(
<font color='#880000'>- Timestamp64_Control *_start,
- Timestamp64_Control *_end,
- Timestamp64_Control *_result
</font><font color='#000088'>+ const Timestamp64_Control *_start,
+ const Timestamp64_Control *_end,
+ Timestamp64_Control *_result
</font> );
#endif
<font color='#000088'>+static inline void _Timestamp64_implementation_Divide_by_integer(
+ const Timestamp64_Control *_time,
+ uint32_t _iterations,
+ Timestamp64_Control *_result
+)
+{
+ *_result = *_time / _iterations;
+}
+
</font> /**
* @brief Divide Timestamp By Integer
*
<font color='#997700'>@@ -284,20 +320,16 @@
</font> *
* @param[in] _time points to the total
* @param[in] _iterations is the number of iterations
<font color='#880000'>- * @param[in] _result points to the average time.
- *
- * @return This method fills in @a result.
</font><font color='#000088'>+ * @param[out] _result points to the average time.
</font> */
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64_INLINE == TRUE
</font> #define _Timestamp64_Divide_by_integer( _time, _iterations, _result ) \
<font color='#880000'>- do { \
- *(_result) = *(_time) / (_iterations); \
- } while (0)
</font><font color='#000088'>+ _Timestamp64_implementation_Divide_by_integer( _time, _iterations, _result )
</font> #else
void _Timestamp64_Divide_by_integer(
<font color='#880000'>- Timestamp64_Control *_time,
- uint32_t _iterations,
- Timestamp64_Control *_result
</font><font color='#000088'>+ const Timestamp64_Control *_time,
+ uint32_t _iterations,
+ Timestamp64_Control *_result
</font> );
#endif
<font color='#997700'>@@ -309,10 +341,8 @@
</font> *
* @param[in] _lhs points to the left hand number
* @param[in] _rhs points to the right hand number
<font color='#880000'>- * @param[in] _ival_percentage points to the integer portion of the average
- * @param[in] _fval_percentage points to the thousandths of percentage
- *
- * @return This method fills in @a result.
</font><font color='#000088'>+ * @param[out] _ival_percentage points to the integer portion of the average
+ * @param[out] _fval_percentage points to the thousandths of percentage
</font> */
void _Timestamp64_Divide(
const Timestamp64_Control *_lhs,
<font color='#997700'>@@ -321,6 +351,13 @@
</font> uint32_t *_fval_percentage
);
<font color='#000088'>+static inline uint32_t _Timestamp64_implementation_Get_seconds(
+ const Timestamp64_Control *_time
+)
+{
+ return (uint32_t) (*_time / 1000000000L);
+}
+
</font> /**
* @brief Get Seconds Portion of Timestamp
*
<font color='#997700'>@@ -330,15 +367,22 @@
</font> *
* @return The seconds portion of @a _time.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64_INLINE == TRUE
</font> #define _Timestamp64_Get_seconds( _time ) \
<font color='#880000'>- (*(_time) / 1000000000)
</font><font color='#000088'>+ _Timestamp64_implementation_Get_seconds( _time )
</font> #else
uint32_t _Timestamp64_Get_seconds(
<font color='#880000'>- Timestamp64_Control *_time
</font><font color='#000088'>+ const Timestamp64_Control *_time
</font> );
#endif
<font color='#000088'>+static inline uint32_t _Timestamp64_implementation_Get_nanoseconds(
+ const Timestamp64_Control *_time
+)
+{
+ return (uint32_t) (*_time % 1000000000L);
+}
+
</font> /**
* @brief Get Nanoseconds Portion of Timestamp
*
<font color='#997700'>@@ -348,33 +392,39 @@
</font> *
* @return The nanoseconds portion of @a _time.
*/
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64_INLINE == TRUE
</font> #define _Timestamp64_Get_nanoseconds( _time ) \
<font color='#880000'>- (*(_time) % 1000000000)
</font><font color='#000088'>+ _Timestamp64_implementation_Get_nanoseconds( _time )
</font> #else
uint32_t _Timestamp64_Get_nanoseconds(
<font color='#880000'>- Timestamp64_Control *_time
</font><font color='#000088'>+ const Timestamp64_Control *_time
</font> );
#endif
<font color='#000088'>+static inline void _Timestamp64_implementation_To_timespec(
+ const Timestamp64_Control *_timestamp,
+ struct timespec *_timespec
+)
+{
+ _timespec->tv_sec = *_timestamp / 1000000000L;
+ _timespec->tv_nsec = *_timestamp % 1000000000L;
+}
+
</font> /**
* @brief Convert Timestamp to struct timespec
*
* This method returns the seconds portion of the specified timestamp
*
* @param[in] _timestamp points to the timestamp
<font color='#880000'>- * @param[in] _timespec points to the timespec
</font><font color='#000088'>+ * @param[out] _timespec points to the timespec
</font> */
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64_INLINE == TRUE
</font> #define _Timestamp64_To_timespec( _timestamp, _timespec ) \
<font color='#880000'>- do { \
- (_timespec)->tv_sec = *(_timestamp) / 1000000000; \
- (_timespec)->tv_nsec = *(_timestamp) % 1000000000; \
- } while (0)
</font><font color='#000088'>+ _Timestamp64_implementation_To_timespec( _timestamp, _timespec )
</font> #else
void _Timestamp64_To_timespec(
<font color='#880000'>- Timestamp64_Control *_timestamp,
- struct timespec *_timespec
</font><font color='#000088'>+ const Timestamp64_Control *_timestamp,
+ struct timespec *_timespec
</font> );
#endif
<font color='#006600'>diff -u rtems/cpukit/score/src/ts64addto.c:1.1 rtems/cpukit/score/src/ts64addto.c:1.2
--- rtems/cpukit/score/src/ts64addto.c:1.1 Tue Dec 9 15:27:35 2008
+++ rtems/cpukit/score/src/ts64addto.c Wed Sep 28 09:42:12 2011
</font><font color='#997700'>@@ -17,18 +17,14 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <sys/types.h>
-
-#include <rtems/system.h>
</font> #include <rtems/score/timestamp.h>
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64) && \
- !defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64 == TRUE
</font> void _Timestamp64_Add_to(
<font color='#880000'>- Timestamp64_Control *_time,
- Timestamp64_Control *_add
</font><font color='#000088'>+ Timestamp64_Control *_time,
+ const Timestamp64_Control *_add
</font> )
{
<font color='#880000'>- *_time += *_add;
</font><font color='#000088'>+ _Timestamp64_implementation_Add_to( _time, _add );
</font> }
#endif
<font color='#006600'>diff -u rtems/cpukit/score/src/ts64divide.c:1.3 rtems/cpukit/score/src/ts64divide.c:1.4
--- rtems/cpukit/score/src/ts64divide.c:1.3 Sun Nov 29 07:51:52 2009
+++ rtems/cpukit/score/src/ts64divide.c Wed Sep 28 09:42:12 2011
</font><font color='#997700'>@@ -17,12 +17,10 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <rtems/system.h>
-#include <sys/types.h>
</font> #include <rtems/score/timestamp.h>
/* This method is never inlined. */
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64 == TRUE || CPU_TIMESTAMP_USE_INT64_INLINE == TRUE
</font> void _Timestamp64_Divide(
const Timestamp64_Control *_lhs,
const Timestamp64_Control *_rhs,
<font color='#006600'>diff -u rtems/cpukit/score/src/ts64dividebyinteger.c:1.1 rtems/cpukit/score/src/ts64dividebyinteger.c:1.2
--- rtems/cpukit/score/src/ts64dividebyinteger.c:1.1 Tue Dec 9 15:27:35 2008
+++ rtems/cpukit/score/src/ts64dividebyinteger.c Wed Sep 28 09:42:12 2011
</font><font color='#997700'>@@ -17,19 +17,15 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <sys/types.h>
-
-#include <rtems/system.h>
</font> #include <rtems/score/timestamp.h>
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64) && \
- !defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64 == TRUE
</font> void _Timestamp64_Divide_by_integer(
<font color='#880000'>- Timestamp64_Control *_time,
- uint32_t _iterations,
- Timestamp64_Control *_result
</font><font color='#000088'>+ const Timestamp64_Control *_time,
+ uint32_t _iterations,
+ Timestamp64_Control *_result
</font> )
{
<font color='#880000'>- *_result = *_time / _iterations;
</font><font color='#000088'>+ _Timestamp64_implementation_Divide_by_integer( _time, _iterations, _result );
</font> }
#endif
<font color='#006600'>diff -u rtems/cpukit/score/src/ts64equalto.c:1.1 rtems/cpukit/score/src/ts64equalto.c:1.2
--- rtems/cpukit/score/src/ts64equalto.c:1.1 Tue Dec 9 15:27:35 2008
+++ rtems/cpukit/score/src/ts64equalto.c Wed Sep 28 09:42:12 2011
</font><font color='#997700'>@@ -17,18 +17,14 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <sys/types.h>
-
-#include <rtems/system.h>
</font> #include <rtems/score/timestamp.h>
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64) && \
- !defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64 == TRUE
</font> bool _Timestamp64_Equal_to(
<font color='#880000'>- Timestamp64_Control *_lhs,
- Timestamp64_Control *_rhs
</font><font color='#000088'>+ const Timestamp64_Control *_lhs,
+ const Timestamp64_Control *_rhs
</font> )
{
<font color='#880000'>- return (*(_lhs) == *(_rhs));
</font><font color='#000088'>+ _Timestamp64_implementation_Equal_to( _lhs, _rhs );
</font> }
#endif
<font color='#006600'>diff -u rtems/cpukit/score/src/ts64getnanoseconds.c:1.2 rtems/cpukit/score/src/ts64getnanoseconds.c:1.3
--- rtems/cpukit/score/src/ts64getnanoseconds.c:1.2 Sun Nov 29 07:51:52 2009
+++ rtems/cpukit/score/src/ts64getnanoseconds.c Wed Sep 28 09:42:12 2011
</font><font color='#997700'>@@ -17,17 +17,13 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <sys/types.h>
-
-#include <rtems/system.h>
</font> #include <rtems/score/timestamp.h>
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64) && \
- !defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64 == TRUE
</font> uint32_t _Timestamp64_Get_nanoseconds(
<font color='#880000'>- Timestamp64_Control *_time
</font><font color='#000088'>+ const Timestamp64_Control *_time
</font> )
{
<font color='#880000'>- return *(_time) % 1000000000;
</font><font color='#000088'>+ _Timestamp64_implementation_Get_nanoseconds( _time );
</font> }
#endif
<font color='#006600'>diff -u rtems/cpukit/score/src/ts64getseconds.c:1.1 rtems/cpukit/score/src/ts64getseconds.c:1.2
--- rtems/cpukit/score/src/ts64getseconds.c:1.1 Tue Dec 9 15:27:35 2008
+++ rtems/cpukit/score/src/ts64getseconds.c Wed Sep 28 09:42:12 2011
</font><font color='#997700'>@@ -17,17 +17,13 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <sys/types.h>
-
-#include <rtems/system.h>
</font> #include <rtems/score/timestamp.h>
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64) && \
- !defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64 == TRUE
</font> uint32_t _Timestamp64_Get_seconds(
<font color='#880000'>- Timestamp64_Control *_time
</font><font color='#000088'>+ const Timestamp64_Control *_time
</font> )
{
<font color='#880000'>- return *(_time) / 1000000000;
</font><font color='#000088'>+ _Timestamp64_implementation_Get_seconds( _time );
</font> }
#endif
<font color='#006600'>diff -u rtems/cpukit/score/src/ts64lessthan.c:1.1 rtems/cpukit/score/src/ts64lessthan.c:1.2
--- rtems/cpukit/score/src/ts64lessthan.c:1.1 Tue Dec 9 15:27:35 2008
+++ rtems/cpukit/score/src/ts64lessthan.c Wed Sep 28 09:42:12 2011
</font><font color='#997700'>@@ -17,18 +17,14 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <sys/types.h>
-
-#include <rtems/system.h>
</font> #include <rtems/score/timestamp.h>
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64) && \
- !defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64 == TRUE
</font> bool _Timestamp64_Less_than(
<font color='#880000'>- Timestamp64_Control *_lhs,
- Timestamp64_Control *_rhs
</font><font color='#000088'>+ const Timestamp64_Control *_lhs,
+ const Timestamp64_Control *_rhs
</font> )
{
<font color='#880000'>- return (*(_lhs) < *(_rhs));
</font><font color='#000088'>+ _Timestamp64_implementation_Less_than( _lhs, _rhs );
</font> }
#endif
<font color='#006600'>diff -u rtems/cpukit/score/src/ts64set.c:1.1 rtems/cpukit/score/src/ts64set.c:1.2
--- rtems/cpukit/score/src/ts64set.c:1.1 Tue Dec 9 15:27:35 2008
+++ rtems/cpukit/score/src/ts64set.c Wed Sep 28 09:42:12 2011
</font><font color='#997700'>@@ -17,23 +17,15 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <sys/types.h>
-
-#include <rtems/system.h>
</font> #include <rtems/score/timestamp.h>
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64) && \
- !defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64 == TRUE
</font> void _Timestamp64_Set(
Timestamp64_Control *_time,
long _seconds,
long _nanoseconds
)
{
<font color='#880000'>- int64_t time;
-
- time = (int64_t)_seconds * 1000000000;
- time += (int64_t)_nanoseconds;
- *_time = time;
</font><font color='#000088'>+ _Timestamp64_implementation_Set( _time, _seconds, _nanoseconds );
</font> }
#endif
<font color='#006600'>diff -u rtems/cpukit/score/src/ts64settozero.c:1.1 rtems/cpukit/score/src/ts64settozero.c:1.2
--- rtems/cpukit/score/src/ts64settozero.c:1.1 Tue Dec 9 15:27:35 2008
+++ rtems/cpukit/score/src/ts64settozero.c Wed Sep 28 09:42:12 2011
</font><font color='#997700'>@@ -17,17 +17,13 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <sys/types.h>
-
-#include <rtems/system.h>
</font> #include <rtems/score/timestamp.h>
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64) && \
- !defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64 == TRUE
</font> void _Timestamp64_Set_to_zero(
Timestamp64_Control *_time
)
{
<font color='#880000'>- *_time = 0;
</font><font color='#000088'>+ _Timestamp64_implementation_Set_to_zero( _time );
</font> }
#endif
<font color='#006600'>diff -u rtems/cpukit/score/src/ts64subtract.c:1.1 rtems/cpukit/score/src/ts64subtract.c:1.2
--- rtems/cpukit/score/src/ts64subtract.c:1.1 Tue Dec 9 15:27:35 2008
+++ rtems/cpukit/score/src/ts64subtract.c Wed Sep 28 09:42:12 2011
</font><font color='#997700'>@@ -17,19 +17,15 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <sys/types.h>
-
-#include <rtems/system.h>
</font> #include <rtems/score/timestamp.h>
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64) && \
- !defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64 == TRUE
</font> void _Timestamp64_Subtract(
<font color='#880000'>- Timestamp64_Control *_start,
- Timestamp64_Control *_end,
- Timestamp64_Control *_result
</font><font color='#000088'>+ const Timestamp64_Control *_start,
+ const Timestamp64_Control *_end,
+ Timestamp64_Control *_result
</font> )
{
<font color='#880000'>- *_result = *_end - *_start;
</font><font color='#000088'>+ _Timestamp64_implementation_Subtract( _start, _end, _result );
</font> }
#endif
<font color='#006600'>diff -u rtems/cpukit/score/src/ts64toticks.c:1.3 rtems/cpukit/score/src/ts64toticks.c:1.4
--- rtems/cpukit/score/src/ts64toticks.c:1.3 Sun Nov 29 07:51:52 2009
+++ rtems/cpukit/score/src/ts64toticks.c Wed Sep 28 09:42:12 2011
</font><font color='#997700'>@@ -24,8 +24,7 @@
</font> #include <rtems/score/timestamp.h>
#include <rtems/score/tod.h>
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64) && \
- !defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64 == TRUE
</font> uint32_t _Timestamp64_To_ticks(
const Timestamp64_Control *time
)
<font color='#006600'>diff -u rtems/cpukit/score/src/ts64totimespec.c:1.1 rtems/cpukit/score/src/ts64totimespec.c:1.2
--- rtems/cpukit/score/src/ts64totimespec.c:1.1 Tue Dec 9 15:27:35 2008
+++ rtems/cpukit/score/src/ts64totimespec.c Wed Sep 28 09:42:12 2011
</font><font color='#997700'>@@ -17,19 +17,14 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <sys/types.h>
-
-#include <rtems/system.h>
</font> #include <rtems/score/timestamp.h>
<font color='#880000'>-#if defined(CPU_RTEMS_SCORE_TIMESTAMP_IS_INT64) && \
- !defined(CPU_RTEMS_SCORE_TIMESTAMP_INT64_INLINE)
</font><font color='#000088'>+#if CPU_TIMESTAMP_USE_INT64 == TRUE
</font> void _Timestamp64_To_timespec(
<font color='#880000'>- Timestamp64_Control *_timestamp,
- struct timespec *_timespec
</font><font color='#000088'>+ const Timestamp64_Control *_timestamp,
+ struct timespec *_timespec
</font> )
{
<font color='#880000'>- _timespec->tv_sec = *_timestamp / 1000000000;
- _timespec->tv_nsec = *_timestamp % 1000000000;
</font><font color='#000088'>+ _Timestamp64_implementation_To_timespec( _timestamp, _timespec );
</font> }
#endif
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>