diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-16 17:36:01 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-16 17:36:01 +0000 |
| commit | 3d66dfc1cb98974df47bf4735291a674d34038bc (patch) | |
| tree | 23d592a42aa1a333463855389a9a6a0151a3f704 /cpukit/rtems | |
| parent | 2008-12-16 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-3d66dfc1cb98974df47bf4735291a674d34038bc.tar.bz2 | |
2008-12-16 Joel Sherrill <joel.sherrill@oarcorp.com>
* libcsupport/src/__times.c, posix/src/adjtime.c,
posix/src/clockgetres.c, posix/src/sysconf.c,
rtems/src/clockgettickspersecond.c, rtems/src/clockgettod.c,
rtems/src/clockset.c, rtems/src/clocktodvalidate.c,
score/src/timespecfromticks.c, score/src/timespectoticks.c,
score/src/ts64toticks.c: More case converted to use configuration
table entry not _TOD_Microseconds_per_tick.
Diffstat (limited to 'cpukit/rtems')
| -rw-r--r-- | cpukit/rtems/src/clockgettickspersecond.c | 4 | ||||
| -rw-r--r-- | cpukit/rtems/src/clockgettod.c | 4 | ||||
| -rw-r--r-- | cpukit/rtems/src/clockset.c | 3 | ||||
| -rw-r--r-- | cpukit/rtems/src/clocktodvalidate.c | 7 |
4 files changed, 13 insertions, 5 deletions
diff --git a/cpukit/rtems/src/clockgettickspersecond.c b/cpukit/rtems/src/clockgettickspersecond.c index 9a4bd1ccad..23e2dd7c39 100644 --- a/cpukit/rtems/src/clockgettickspersecond.c +++ b/cpukit/rtems/src/clockgettickspersecond.c @@ -16,6 +16,7 @@ #endif #include <rtems/system.h> +#include <rtems/config.h> #include <rtems/rtems/status.h> #include <rtems/rtems/clock.h> #include <rtems/score/isr.h> @@ -25,5 +26,6 @@ rtems_interval rtems_clock_get_ticks_per_second(void) { - return TOD_MICROSECONDS_PER_SECOND / _TOD_Microseconds_per_tick; + return TOD_MICROSECONDS_PER_SECOND / + rtems_configuration_get_microseconds_per_tick(); } diff --git a/cpukit/rtems/src/clockgettod.c b/cpukit/rtems/src/clockgettod.c index 9347d797ee..128fd3480e 100644 --- a/cpukit/rtems/src/clockgettod.c +++ b/cpukit/rtems/src/clockgettod.c @@ -16,6 +16,7 @@ #endif #include <rtems/system.h> +#include <rtems/config.h> #include <rtems/rtems/status.h> #include <rtems/rtems/clock.h> #include <rtems/score/isr.h> @@ -50,7 +51,8 @@ rtems_status_code rtems_clock_get_tod( tmbuf->hour = time.tm_hour; tmbuf->minute = time.tm_min; tmbuf->second = time.tm_sec; - tmbuf->ticks = now.tv_usec / _TOD_Microseconds_per_tick; + tmbuf->ticks = now.tv_usec / + rtems_configuration_get_microseconds_per_tick(); return RTEMS_SUCCESSFUL; } diff --git a/cpukit/rtems/src/clockset.c b/cpukit/rtems/src/clockset.c index 1b1bbe8b04..30127cdc39 100644 --- a/cpukit/rtems/src/clockset.c +++ b/cpukit/rtems/src/clockset.c @@ -16,6 +16,7 @@ #endif #include <rtems/system.h> +#include <rtems/config.h> #include <rtems/rtems/status.h> #include <rtems/rtems/clock.h> #include <rtems/score/isr.h> @@ -49,7 +50,7 @@ rtems_status_code rtems_clock_set( if ( _TOD_Validate( time_buffer ) ) { newtime.tv_sec = _TOD_To_seconds( time_buffer ); newtime.tv_nsec = time_buffer->ticks * - (_TOD_Microseconds_per_tick * TOD_NANOSECONDS_PER_MICROSECOND); + rtems_configuration_get_nanoseconds_per_tick(); _Thread_Disable_dispatch(); _TOD_Set( &newtime ); diff --git a/cpukit/rtems/src/clocktodvalidate.c b/cpukit/rtems/src/clocktodvalidate.c index e40f7b9595..54da8284b3 100644 --- a/cpukit/rtems/src/clocktodvalidate.c +++ b/cpukit/rtems/src/clocktodvalidate.c @@ -17,6 +17,7 @@ #endif #include <rtems/system.h> +#include <rtems/config.h> #include <rtems/rtems/clock.h> /* @@ -51,10 +52,12 @@ bool _TOD_Validate( ) { uint32_t days_in_month; + uint32_t ticks_per_second; + ticks_per_second = TOD_MICROSECONDS_PER_SECOND / + rtems_configuration_get_microseconds_per_tick(); if ((!the_tod) || - (the_tod->ticks >= - (TOD_MICROSECONDS_PER_SECOND / _TOD_Microseconds_per_tick)) || + (the_tod->ticks >= ticks_per_second) || (the_tod->second >= TOD_SECONDS_PER_MINUTE) || (the_tod->minute >= TOD_MINUTES_PER_HOUR) || (the_tod->hour >= TOD_HOURS_PER_DAY) || |