2007-04-05 Joel Sherrill <joel@OARcorp.com>

	* posix/Makefile.am, posix/include/rtems/posix/time.h,
	posix/src/adjtime.c, posix/src/alarm.c, posix/src/clockgetres.c,
	posix/src/condtimedwait.c, posix/src/mqueuetimedreceive.c,
	posix/src/mqueuetimedsend.c, posix/src/mutextimedlock.c,
	posix/src/nanosleep.c, posix/src/posixtimespecabsolutetimeout.c,
	posix/src/pthread.c, posix/src/pthreadcreate.c,
	posix/src/pthreadsetschedparam.c, posix/src/ptimer1.c,
	posix/src/sched.c, posix/src/semtimedwait.c,
	posix/src/sigtimedwait.c, posix/src/ualarm.c,
	rtems/src/clocktodtoseconds.c, score/Makefile.am,
	score/preinstall.am, score/include/rtems/score/tod.h,
	score/inline/rtems/score/tod.inl, score/src/coretod.c,
	score/src/coretodget.c, score/src/coretodgetuptime.c,
	score/src/coretodset.c, score/src/coretodtickle.c: Provide timespec
	manipulation routines in the SuperCore. Use them everywhere possible.
	This lead to significant cleanup in the API routines and eliminated
	some of the same code from the POSIX API. At this point, the
	SuperCore keeps time in POSIX timespec format properly from 1970. You
	just cannot set it before 1988 in keeping with RTEMS traditional
	behavior.
	* score/include/rtems/score/timespec.h, score/src/timespecaddto.c,
	score/src/timespecfromticks.c, score/src/timespecisvalid.c,
	score/src/timespeclessthan.c, score/src/timespecsubtract.c,
	score/src/timespectoticks.c: New files.
	* posix/src/posixintervaltotimespec.c,
	posix/src/posixtimespecsubtract.c,
	posix/src/posixtimespectointerval.c: Removed.

1 files changed, 19 insertions, 7 deletions

diff --git a/cpukit/posix/src/adjtime.c b/cpukit/posix/src/adjtime.c
index 1e06dab608..e8743181aa 100644
--- a/cpukit/posix/src/adjtime.c
+++ b/cpukit/posix/src/adjtime.c
@@ -1,8 +1,17 @@
 /*
- *  adjustime() function - required by NTP
+ *  adjime() function - required by NTP
  *
  *  I am unaware of the history behind the definition of this service
  *  and don't know if its behavior is covered by any standard. --joel
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2007.
+ *  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$
  */
@@ -32,16 +41,19 @@ int  adjtime ( struct timeval *delta, struct timeval *olddelta )
   if ( !delta )
     return -1;
 
-  __adjustment = (delta->tv_sec * TOD_MICROSECONDS_PER_SECOND) + delta->tv_usec;
+  /* convert delta to microseconds */
+  __adjustment  = (delta->tv_sec * TOD_MICROSECONDS_PER_SECOND);
+  __adjustment += delta->tv_usec;
+
   /* too small to account for */
   if ( __adjustment < _TOD_Microseconds_per_tick )
     return 0;
 
-  clock_gettime( CLOCK_REALTIME, &ts );
+  /* Grab the current TOD */
+  _TOD_Get( &ts );
 
-  ts.tv_sec  += (__adjustment / TOD_MICROSECONDS_PER_SECOND);
-  ts.tv_nsec += (__adjustment % TOD_MICROSECONDS_PER_SECOND) *
-                       TOD_NANOSECONDS_PER_MICROSECOND;
+  ts.tv_sec  += delta->tv_sec;
+  ts.tv_nsec += delta->tv_usec * TOD_NANOSECONDS_PER_MICROSECOND;
 
   /* if adjustment is too much positive */
   while ( ts.tv_nsec >= TOD_NANOSECONDS_PER_SECOND ) {
@@ -55,6 +67,6 @@ int  adjtime ( struct timeval *delta, struct timeval *olddelta )
     ts.tv_sec--;
   }
 
-  clock_settime( CLOCK_REALTIME, &ts );
+  _TOD_Set( &ts );
   return 0;
 }