diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-16 20:53:34 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-16 20:53:34 +0000 |
commit | 26fb4aadcd2c3159ecca7493c1f3d02cc02149ba (patch) | |
tree | e352a00acf541d65590f7c250b9fd9cd61f4e70d /cpukit/score | |
parent | 2008-12-16 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-26fb4aadcd2c3159ecca7493c1f3d02cc02149ba.tar.bz2 |
2008-12-16 Joel Sherrill <joel.sherrill@oarcorp.com>
* libblock/src/bdbuf.c, libmisc/capture/capture-cli.c,
libmisc/capture/capture.c, libmisc/mw-fb/mw_uid.c,
rtems/include/rtems/rtems/support.h, score/Makefile.am,
score/include/rtems/score/tod.h, score/src/coretod.c,
score/src/coretodtickle.c: Eliminate all public use of TOD conversion
routines. Eliminate _TOD_Microseconds_per_tick and let every place
use the field directly from the Configuration Table. This required
moving some methods from macros to bodies.
* score/src/coretodmsecstoticks.c, score/src/coretodtickspersec.c,
score/src/coretodusectoticks.c: New files.
Diffstat (limited to '')
-rw-r--r-- | cpukit/score/Makefile.am | 3 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/tod.h | 40 | ||||
-rw-r--r-- | cpukit/score/src/coretod.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/coretodmsecstoticks.c | 25 | ||||
-rw-r--r-- | cpukit/score/src/coretodtickle.c | 3 | ||||
-rw-r--r-- | cpukit/score/src/coretodtickspersec.c | 24 | ||||
-rw-r--r-- | cpukit/score/src/coretodusectoticks.c | 25 |
7 files changed, 95 insertions, 27 deletions
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 82ebc5e20d..81e2e525f7 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -178,7 +178,8 @@ libscore_a_SOURCES += src/ts64addto.c src/ts64dividebyinteger.c \ ## TOD_C_FILES libscore_a_SOURCES += src/coretod.c src/coretodset.c src/coretodget.c \ - src/coretodgetuptime.c src/coretodgetuptimetimespec.c src/coretodtickle.c + src/coretodgetuptime.c src/coretodgetuptimetimespec.c src/coretodtickle.c \ + src/coretodmsecstoticks.c src/coretodtickspersec.c src/coretodusectoticks.c ## WATCHDOG_C_FILES libscore_a_SOURCES += src/watchdog.c src/watchdogadjust.c \ diff --git a/cpukit/score/include/rtems/score/tod.h b/cpukit/score/include/rtems/score/tod.h index 44d4df862e..fb3ac98140 100644 --- a/cpukit/score/include/rtems/score/tod.h +++ b/cpukit/score/include/rtems/score/tod.h @@ -101,14 +101,6 @@ extern "C" { (((1987 - 1970 + 1) * TOD_SECONDS_PER_NON_LEAP_YEAR) + \ (4 * TOD_SECONDS_PER_DAY)) -/** @brief Ticks per Second - * - * This macro calculates the number of ticks per second. - */ - -#define TOD_TICKS_PER_SECOND \ - (TOD_MICROSECONDS_PER_SECOND / _TOD_Microseconds_per_tick) - /** @brief RTEMS Epoch Year * * The following constant define the earliest year to which an @@ -148,12 +140,6 @@ SCORE_EXTERN Timestamp_Control _TOD_Uptime; #define _TOD_Seconds_since_epoch() \ _Timestamp_Get_seconds(&_TOD_Now) -/** @brief Microseconds per Clock Tick - * - * The following contains the number of microseconds per tick. - */ -SCORE_EXTERN uint32_t _TOD_Microseconds_per_tick; - /** @brief _TOD_Handler_initialization * * This routine performs the initialization necessary for this handler. @@ -224,8 +210,9 @@ void _TOD_Tickle_ticks( void ); * * @note This must be a macro so it can be used in "static" tables. */ -#define TOD_MICROSECONDS_TO_TICKS(_us) \ - ((_us) / _TOD_Microseconds_per_tick) +uint32_t TOD_MICROSECONDS_TO_TICKS( + uint32_t microseconds +); /** @brief TOD_MILLISECONDS_TO_TICKS * @@ -233,20 +220,27 @@ void _TOD_Tickle_ticks( void ); * * @note This must be a macro so it can be used in "static" tables. */ - -#define TOD_MILLISECONDS_TO_TICKS(_ms) \ - (TOD_MILLISECONDS_TO_MICROSECONDS(_ms) / _TOD_Microseconds_per_tick) - +uint32_t TOD_MILLISECONDS_TO_TICKS( + uint32_t microseconds +); /** @brief How many ticks in a second? * - * This macro returns the number of ticks in a second. + * This method returns the number of ticks in a second. * * @note If the clock tick value does not multiply evenly into a second * then this number of ticks will be slightly shorter than a second. */ -#define TOD_TICKS_PER_SECOND \ - (TOD_MICROSECONDS_PER_SECOND / _TOD_Microseconds_per_tick) +uint32_t TOD_TICKS_PER_SECOND_method(void); + +/** @brief Method to return number of ticks in a second + * + * This method exists to hide the fact that TOD_TICKS_PER_SECOND can no + * be implemented as a macro in a .h file due to visibility issues. + * The Configuration Table is not available to SuperCore .h files but + * is available to their .c files. + */ +#define TOD_TICKS_PER_SECOND TOD_TICKS_PER_SECOND_method() #ifndef __RTEMS_APPLICATION__ #include <rtems/score/tod.inl> diff --git a/cpukit/score/src/coretod.c b/cpukit/score/src/coretod.c index cf4ec8e334..6d0fc11b5a 100644 --- a/cpukit/score/src/coretod.c +++ b/cpukit/score/src/coretod.c @@ -38,8 +38,6 @@ void _TOD_Handler_initialization( uint32_t microseconds_per_tick ) { - _TOD_Microseconds_per_tick = microseconds_per_tick; - /* POSIX format TOD (timespec) */ _Timestamp_Set( &_TOD_Now, TOD_SECONDS_1970_THROUGH_1988, 0 ); diff --git a/cpukit/score/src/coretodmsecstoticks.c b/cpukit/score/src/coretodmsecstoticks.c new file mode 100644 index 0000000000..cddd3d646d --- /dev/null +++ b/cpukit/score/src/coretodmsecstoticks.c @@ -0,0 +1,25 @@ +/* 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.com/license/LICENSE. + * + * $Id$ + */ + + +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#include <rtems/system.h> +#include <rtems/config.h> +#include <rtems/score/tod.h> + +uint32_t TOD_MILLISECONDS_TO_TICKS( + uint32_t milliseconds +) +{ + return (milliseconds / rtems_configuration_get_milliseconds_per_tick()); +} diff --git a/cpukit/score/src/coretodtickle.c b/cpukit/score/src/coretodtickle.c index f4e5a4f69c..ddc8e4aac0 100644 --- a/cpukit/score/src/coretodtickle.c +++ b/cpukit/score/src/coretodtickle.c @@ -22,6 +22,7 @@ #include <rtems/score/timestamp.h> #include <rtems/score/tod.h> #include <rtems/score/watchdog.h> +#include <rtems/config.h> /*PAGE * @@ -40,7 +41,7 @@ void _TOD_Tickle_ticks( void ) uint32_t seconds; /* Convert the tick quantum to a timestamp */ - _Timestamp_Set( &tick, 0, _TOD_Microseconds_per_tick * 1000 ); + _Timestamp_Set( &tick, 0, rtems_configuration_get_nanoseconds_per_tick() ); /* Update the counter of ticks since boot */ _Watchdog_Ticks_since_boot += 1; diff --git a/cpukit/score/src/coretodtickspersec.c b/cpukit/score/src/coretodtickspersec.c new file mode 100644 index 0000000000..ac6316ba7b --- /dev/null +++ b/cpukit/score/src/coretodtickspersec.c @@ -0,0 +1,24 @@ +/* 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.com/license/LICENSE. + * + * $Id$ + */ + + +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#include <rtems/system.h> +#include <rtems/config.h> +#include <rtems/score/tod.h> + +uint32_t TOD_TICKS_PER_SECOND_method(void) +{ + return (TOD_MICROSECONDS_PER_SECOND / + rtems_configuration_get_microseconds_per_tick()); +} diff --git a/cpukit/score/src/coretodusectoticks.c b/cpukit/score/src/coretodusectoticks.c new file mode 100644 index 0000000000..be2cbd7024 --- /dev/null +++ b/cpukit/score/src/coretodusectoticks.c @@ -0,0 +1,25 @@ +/* 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.com/license/LICENSE. + * + * $Id$ + */ + + +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#include <rtems/system.h> +#include <rtems/config.h> +#include <rtems/score/tod.h> + +uint32_t TOD_MICROSECONDS_TO_TICKS( + uint32_t microseconds +) +{ + return (microseconds / rtems_configuration_get_microseconds_per_tick()); +} |