diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-04-02 21:51:52 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-04-02 21:51:52 +0000 |
| commit | f6e09342eea83a34edeb71a140c988a818053a32 (patch) | |
| tree | e95c73dd531486201f9285b7deac1d4627cbf5d6 /cpukit/rtems | |
| parent | 2007-04-02 Jennifer Averett <jennifer.averrett@oarcorp.com> (diff) | |
| download | rtems-f6e09342eea83a34edeb71a140c988a818053a32.tar.bz2 | |
2007-04-02 Joel Sherrill <joel@OARcorp.com>
* posix/include/rtems/posix/timer.h, posix/src/alarm.c,
posix/src/posixtimespectointerval.c, posix/src/ptimer1.c,
posix/src/sysconf.c, posix/src/ualarm.c, rtems/src/clockget.c,
rtems/src/clocktodvalidate.c, score/include/rtems/score/tod.h,
score/inline/rtems/score/tod.inl, score/src/coretod.c: Eliminate
TOD_Ticks_per_second variable.
Diffstat (limited to 'cpukit/rtems')
| -rw-r--r-- | cpukit/rtems/src/clockget.c | 22 | ||||
| -rw-r--r-- | cpukit/rtems/src/clocktodvalidate.c | 3 |
2 files changed, 18 insertions, 7 deletions
diff --git a/cpukit/rtems/src/clockget.c b/cpukit/rtems/src/clockget.c index f5948bcffd..1c62256614 100644 --- a/cpukit/rtems/src/clockget.c +++ b/cpukit/rtems/src/clockget.c @@ -75,23 +75,33 @@ rtems_status_code rtems_clock_get( return RTEMS_SUCCESSFUL; } - case RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH: + case RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH: { + rtems_interval *interval = (rtems_interval *)time_buffer; + if ( !_TOD_Is_set ) return RTEMS_NOT_DEFINED; - *(rtems_interval *)time_buffer = _TOD_Seconds_since_epoch; + *interval = _TOD_Seconds_since_epoch; return RTEMS_SUCCESSFUL; + } - case RTEMS_CLOCK_GET_TICKS_SINCE_BOOT: - *(rtems_interval *)time_buffer = _Watchdog_Ticks_since_boot; + case RTEMS_CLOCK_GET_TICKS_SINCE_BOOT: { + rtems_interval *interval = (rtems_interval *)time_buffer; + + *interval = _Watchdog_Ticks_since_boot; return RTEMS_SUCCESSFUL; + } - case RTEMS_CLOCK_GET_TICKS_PER_SECOND: - *(rtems_interval *)time_buffer = _TOD_Ticks_per_second; + case RTEMS_CLOCK_GET_TICKS_PER_SECOND: { + rtems_interval *interval = (rtems_interval *)time_buffer; + + *interval = TOD_MICROSECONDS_PER_SECOND / _TOD_Microseconds_per_tick; return RTEMS_SUCCESSFUL; + } case RTEMS_CLOCK_GET_TIME_VALUE: { struct timeval *time = (struct timeval *)time_buffer; + if ( !_TOD_Is_set ) return RTEMS_NOT_DEFINED; diff --git a/cpukit/rtems/src/clocktodvalidate.c b/cpukit/rtems/src/clocktodvalidate.c index 09cb5b4092..c9bdf4fd12 100644 --- a/cpukit/rtems/src/clocktodvalidate.c +++ b/cpukit/rtems/src/clocktodvalidate.c @@ -53,7 +53,8 @@ boolean _TOD_Validate( uint32_t days_in_month; if ((!the_tod) || - (the_tod->ticks >= _TOD_Ticks_per_second) || + (the_tod->ticks >= + (TOD_MICROSECONDS_PER_SECOND / _TOD_Microseconds_per_tick)) || (the_tod->second >= TOD_SECONDS_PER_MINUTE) || (the_tod->minute >= TOD_MINUTES_PER_HOUR) || (the_tod->hour >= TOD_HOURS_PER_DAY) || |