2008-03-11 Joel Sherrill <joel.sherrill@oarcorp.com>

	* rtems/Makefile.am, rtems/include/rtems/rtems/clock.h,
	rtems/src/clockget.c:
	* rtems/src/clockgetsecondssinceepoch.c,
	rtems/src/clockgettickspersecond.c,
	rtems/src/clockgettickssinceboot.c, rtems/src/clockgettod.c,
	rtems/src/clockgettodtimeval.c: New files.
	Refactored rtems_clock_get into 5 methods which are single purpose
	and more strongly typed.  They are:
	    rtems_clock_get_tod - Get TOD in Classic API structure
	    rtems_clock_get_tod_timeval - Get TOD in struct timeval
	    rtems_clock_get_seconds_since_epoch - Get TOD as seconds since 1988
	    rtems_clock_get_ticks_since_boot - Get ticks since boot
	    rtems_clock_get_ticks_per_second - Get ticks per second

1 files changed, 13 insertions, 49 deletions

diff --git a/cpukit/rtems/src/clockget.c b/cpukit/rtems/src/clockget.c
index ba0fabf8e5..0009d47fb3 100644
--- a/cpukit/rtems/src/clockget.c
+++ b/cpukit/rtems/src/clockget.c
@@ -1,7 +1,7 @@
 /*
  *  Clock Manager
  *
- *  COPYRIGHT (c) 1989-2007.
+ *  COPYRIGHT (c) 1989-2008.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -50,65 +50,29 @@ rtems_status_code rtems_clock_get(
     return RTEMS_INVALID_ADDRESS;
 
   switch ( option ) {
-    case RTEMS_CLOCK_GET_TOD: {
-      struct tm time;
-      struct timeval now;
-      rtems_time_of_day *tmbuf = (rtems_time_of_day *)time_buffer;
+    case RTEMS_CLOCK_GET_TOD:
+      return rtems_clock_get_tod( (rtems_time_of_day *)time_buffer ); 
 
-      if ( !_TOD_Is_set )
-        return RTEMS_NOT_DEFINED;
-
-      /* Obtain the current time */
-      _TOD_Get_timeval( &now );
-
-      /* Split it into a closer format */
-      gmtime_r( &now.tv_sec, &time );
-
-      /* Now adjust it to the RTEMS format */
-      tmbuf->year   = time.tm_year + 1900;
-      tmbuf->month  = time.tm_mon + 1;
-      tmbuf->day    = time.tm_mday;
-      tmbuf->hour   = time.tm_hour;
-      tmbuf->minute = time.tm_min;
-      tmbuf->second = time.tm_sec;
-      tmbuf->ticks  = now.tv_usec / _TOD_Microseconds_per_tick;
-     
-      return RTEMS_SUCCESSFUL;
-    }
-    case RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH: {
-      rtems_interval *interval = (rtems_interval *)time_buffer;
-
-      if ( !_TOD_Is_set )
-        return RTEMS_NOT_DEFINED;
-
-      *interval = _TOD_Seconds_since_epoch;
-      return RTEMS_SUCCESSFUL;
-    }
+    case RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH:
+      return rtems_clock_get_seconds_since_epoch((rtems_interval *)time_buffer);
 
     case RTEMS_CLOCK_GET_TICKS_SINCE_BOOT: {
       rtems_interval *interval = (rtems_interval *)time_buffer;
-
-      *interval = _Watchdog_Ticks_since_boot;
+  
+      *interval = rtems_clock_get_ticks_since_boot();
       return RTEMS_SUCCESSFUL;
     }
-
     case RTEMS_CLOCK_GET_TICKS_PER_SECOND: {
       rtems_interval *interval = (rtems_interval *)time_buffer;
-
-      *interval = TOD_MICROSECONDS_PER_SECOND / _TOD_Microseconds_per_tick;
+  
+      *interval = rtems_clock_get_ticks_per_second();
       return RTEMS_SUCCESSFUL;
     }
+    case RTEMS_CLOCK_GET_TIME_VALUE:
+      return rtems_clock_get_tod_timeval( (struct timeval *)time_buffer );
 
-    case RTEMS_CLOCK_GET_TIME_VALUE: {
-      struct timeval *time = (struct timeval *)time_buffer;
-
-      if ( !_TOD_Is_set )
-        return RTEMS_NOT_DEFINED;
-
-      _TOD_Get_timeval( time );
-
-      return RTEMS_SUCCESSFUL;
-    }
+    default:
+      break;
   }
 
   return RTEMS_INVALID_NUMBER;