diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-04-02 18:23:59 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-04-02 18:23:59 +0000 |
| commit | 812da546889eea0b6dea7eb2954f46a4c43d1314 (patch) | |
| tree | 22fc95d921c3544de770454a2f9c604d5d0a27a2 /cpukit/posix/src/clockgettime.c | |
| parent | 2007-04-02 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-812da546889eea0b6dea7eb2954f46a4c43d1314.tar.bz2 | |
2007-04-02 Joel Sherrill <joel@OARcorp.com>
* itron/src/itrontime.c, libcsupport/src/__gettod.c,
posix/include/rtems/posix/time.h, posix/include/rtems/posix/timer.h,
posix/src/clockgettime.c, posix/src/clocksettime.c,
posix/src/nanosleep.c, posix/src/posixtimespecsubtract.c,
posix/src/posixtimespectointerval.c, posix/src/ptimer1.c,
posix/src/sleep.c, rtems/Makefile.am,
rtems/include/rtems/rtems/clock.h, rtems/include/rtems/rtems/timer.h,
rtems/include/rtems/rtems/types.h, rtems/src/clockget.c,
rtems/src/clockset.c, rtems/src/clocktodtoseconds.c,
rtems/src/clocktodvalidate.c, rtems/src/taskwakewhen.c,
score/Makefile.am, score/include/rtems/score/tod.h,
score/inline/rtems/score/tod.inl, score/src/coretod.c,
score/src/coretodset.c: Convert from Classic API style TOD_Control as
fundamental time structure to POSIX struct timespec. Add
clock_get_uptime().
* rtems/src/clockgetuptime.c, score/src/coretodget.c,
score/src/coretodgetuptime.c: New files.
* score/src/coretodtickle.c, score/src/coretodtoseconds.c,
score/src/coretodvalidate.c: Removed.
Diffstat (limited to 'cpukit/posix/src/clockgettime.c')
| -rw-r--r-- | cpukit/posix/src/clockgettime.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/cpukit/posix/src/clockgettime.c b/cpukit/posix/src/clockgettime.c index 5a39bba210..d5752359c0 100644 --- a/cpukit/posix/src/clockgettime.c +++ b/cpukit/posix/src/clockgettime.c @@ -27,31 +27,24 @@ int clock_gettime( struct timespec *tp ) { - ISR_Level level; - time_t seconds; - long ticks; - if ( !tp ) rtems_set_errno_and_return_minus_one( EINVAL ); switch ( clock_id ) { case CLOCK_REALTIME: + _TOD_Get(tp); + break; - _ISR_Disable( level ); - seconds = _TOD_Seconds_since_epoch; - ticks = _TOD_Current.ticks; - _ISR_Enable( level ); - - tp->tv_sec = seconds + POSIX_TIME_SECONDS_1970_THROUGH_1988; - tp->tv_nsec = ticks * _TOD_Microseconds_per_tick * - TOD_NANOSECONDS_PER_MICROSECOND; +#if 0 + case CLOCK_MONOTONIC: + _TOD_Get_uptime(tp); break; +#endif #ifdef _POSIX_CPUTIME case CLOCK_PROCESS_CPUTIME: - /* don't base this on _Watchdog_Ticks_since_boot--duration is too short*/ - return POSIX_NOT_IMPLEMENTED(); + _TOD_Get_uptime(tp); break; #endif |