ok to both
On Fri, Mar 20, 2015 at 4:08 AM, Alexander Krutwig <alexander.krut...@embedded-brains.de> wrote: > --- > cpukit/score/Makefile.am | 2 +- > cpukit/score/include/rtems/score/timestamp.h | 21 ----------------- > cpukit/score/include/rtems/score/timestamp64.h | 31 ------------------------- > cpukit/score/src/ts64dividebyinteger.c | 32 > -------------------------- > 4 files changed, 1 insertion(+), 85 deletions(-) > delete mode 100644 cpukit/score/src/ts64dividebyinteger.c > > diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am > index 509a243..e7d0181 100644 > --- a/cpukit/score/Makefile.am > +++ b/cpukit/score/Makefile.am > @@ -310,7 +310,7 @@ libscore_a_SOURCES += src/timespecaddto.c > src/timespecfromticks.c \ > src/timespecdividebyinteger.c src/timespecgetasnanoseconds.c > > ## TIMESTAMP_INT64_C_FILES > -libscore_a_SOURCES += src/ts64addto.c src/ts64dividebyinteger.c \ > +libscore_a_SOURCES += src/ts64addto.c \ > src/ts64divide.c src/ts64equalto.c \ > src/ts64getnanoseconds.c src/ts64getseconds.c \ > src/ts64lessthan.c \ > diff --git a/cpukit/score/include/rtems/score/timestamp.h > b/cpukit/score/include/rtems/score/timestamp.h > index 5c23979..d03dbc0 100644 > --- a/cpukit/score/include/rtems/score/timestamp.h > +++ b/cpukit/score/include/rtems/score/timestamp.h > @@ -236,27 +236,6 @@ extern "C" { > #endif > > /** > - * @brief Divides a timestamp by an integer value. > - * > - * This routine divides a timestamp by an integer value. The expected > - * use is to assist in benchmark calculations where you typically > - * divide a duration by a number of iterations. > - * > - * @param[in] _time points to the total > - * @param[in] _iterations is the number of iterations > - * @param[in] _result points to the average time. > - * > - * @retval This method fills in @a result. > - */ > -#if CPU_TIMESTAMP_USE_STRUCT_TIMESPEC == TRUE > - #define _Timestamp_Divide_by_integer( _time, _iterations, _result ) \ > - _Timespec_Divide_by_integer(_time, _iterations, _result ) > -#else > - #define _Timestamp_Divide_by_integer( _time, _iterations, _result ) \ > - _Timestamp64_Divide_by_integer( _time, _iterations, _result ) > -#endif > - > -/** > * @brief Divides a timestamp by another timestamp. > * > * This routine divides a timestamp by another timestamp. The > diff --git a/cpukit/score/include/rtems/score/timestamp64.h > b/cpukit/score/include/rtems/score/timestamp64.h > index 3d40ca2..29e4297 100644 > --- a/cpukit/score/include/rtems/score/timestamp64.h > +++ b/cpukit/score/include/rtems/score/timestamp64.h > @@ -255,37 +255,6 @@ static inline void _Timestamp64_implementation_Subtract( > ); > #endif > > -static inline void _Timestamp64_implementation_Divide_by_integer( > - const Timestamp64_Control *_time, > - uint32_t _iterations, > - Timestamp64_Control *_result > -) > -{ > - *_result = *_time / _iterations; > -} > - > -/** > - * @brief Divide 64-bit timestamp by an integer. > - * > - * This routine divides a timestamp by an integer value. The expected > - * use is to assist in benchmark calculations where you typically > - * divide a duration by a number of iterations. > - * > - * @param[in] _time points to the total > - * @param[in] _iterations is the number of iterations > - * @param[out] _result points to the average time. > - */ > -#if CPU_TIMESTAMP_USE_INT64_INLINE == TRUE > - #define _Timestamp64_Divide_by_integer( _time, _iterations, _result ) \ > - _Timestamp64_implementation_Divide_by_integer( _time, _iterations, > _result ) > -#else > - void _Timestamp64_Divide_by_integer( > - const Timestamp64_Control *_time, > - uint32_t _iterations, > - Timestamp64_Control *_result > - ); > -#endif > - > /** > * @brief Divide 64-bit timestamp by another 64-bit timestamp. > * > diff --git a/cpukit/score/src/ts64dividebyinteger.c > b/cpukit/score/src/ts64dividebyinteger.c > deleted file mode 100644 > index b48c928..0000000 > --- a/cpukit/score/src/ts64dividebyinteger.c > +++ /dev/null > @@ -1,32 +0,0 @@ > -/** > - * @file > - * > - * @brief Divide Timestamp By Integer > - * @ingroup SuperCore > - */ > - > -/* > - * COPYRIGHT (c) 1989-2008. > - * 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. > - */ > - > -#if HAVE_CONFIG_H > -#include "config.h" > -#endif > - > -#include <rtems/score/timestamp.h> > - > -#if CPU_TIMESTAMP_USE_INT64 == TRUE > -void _Timestamp64_Divide_by_integer( > - const Timestamp64_Control *_time, > - uint32_t _iterations, > - Timestamp64_Control *_result > -) > -{ > - _Timestamp64_implementation_Divide_by_integer( _time, _iterations, _result > ); > -} > -#endif > -- > 1.8.4.5 > > _______________________________________________ > devel mailing list > devel@rtems.org > http://lists.rtems.org/mailman/listinfo/devel _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel