[PATCH] closes #3889

[Zacchaeus Leung]

---
 cpukit/include/rtems/posix/timer.h |  1 +
 cpukit/posix/src/psxtimercreate.c  |  1 +
 cpukit/posix/src/timergettime.c    | 61 +++++++++++++++++++-----------
 3 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/cpukit/include/rtems/posix/timer.h b/cpukit/include/rtems/posix/timer.h
index bcbf07a65a..7ae089173a 100644
--- a/cpukit/include/rtems/posix/timer.h
+++ b/cpukit/include/rtems/posix/timer.h
@@ -48,6 +48,7 @@ typedef struct {
   uint32_t          ticks;      /* Number of ticks of the initialization */
   uint32_t          overrun;    /* Number of expirations of the timer    */
   struct timespec   time;       /* Time at which the timer was started   */
+  clockid_t         clock_type; /* The type of timer */
 } POSIX_Timer_Control;
 
 /**
diff --git a/cpukit/posix/src/psxtimercreate.c b/cpukit/posix/src/psxtimercreate.c
index a63cf1d100..804c7a41e7 100644
--- a/cpukit/posix/src/psxtimercreate.c
+++ b/cpukit/posix/src/psxtimercreate.c
@@ -91,6 +91,7 @@ int timer_create(
   ptimer->timer_data.it_value.tv_nsec    = 0;
   ptimer->timer_data.it_interval.tv_sec  = 0;
   ptimer->timer_data.it_interval.tv_nsec = 0;
+  ptimer->clock_type = clock_id;
 
   _Watchdog_Preinitialize( &ptimer->Timer, _Per_CPU_Get_snapshot() );
   _Watchdog_Initialize( &ptimer->Timer, _POSIX_Timer_TSR );
diff --git a/cpukit/posix/src/timergettime.c b/cpukit/posix/src/timergettime.c
index ee2a566f0e..ff2176ac60 100644
--- a/cpukit/posix/src/timergettime.c
+++ b/cpukit/posix/src/timergettime.c
@@ -28,6 +28,7 @@
 #include <rtems/score/todimpl.h>
 #include <rtems/score/watchdogimpl.h>
 #include <rtems/seterr.h>
+#include <rtems/timespec.h>
 
 /*
  *          - When a timer is initialized, the value of the time in
@@ -35,39 +36,55 @@
  *          - When this function is called, it returns the difference
  *            between the current time and the initialization time.
  */
-
 int timer_gettime(
   timer_t            timerid,
   struct itimerspec *value
-)
+) 
 {
   POSIX_Timer_Control *ptimer;
-  ISR_lock_Context     lock_context;
-  uint64_t             now;
-  uint32_t             remaining;
+  ISR_lock_Context lock_context;
+  uint32_t remaining;
+  Per_CPU_Control *cpu;
+  struct timespec *now;
+  struct timespec *expire;
+  struct timespec *result;
 
-  if ( !value )
-    rtems_set_errno_and_return_minus_one( EINVAL );
+  if (!value)
+    rtems_set_errno_and_return_minus_one(EINVAL);
 
-  ptimer = _POSIX_Timer_Get( timerid, &lock_context );
-  if ( ptimer != NULL ) {
-    Per_CPU_Control *cpu;
+  ptimer = _POSIX_Timer_Get(timerid, &lock_context);
+  if (ptimer == NULL) {
+    rtems_set_errno_and_return_minus_one(EINVAL);
+  }
 
-    cpu = _POSIX_Timer_Acquire_critical( ptimer, &lock_context );
-    now = cpu->Watchdog.ticks;
+  cpu = _POSIX_Timer_Acquire_critical(ptimer, &lock_context);
+  rtems_timespec_from_ticks(ptimer->Timer.expire, expire);
 
-    if ( now < ptimer->Timer.expire ) {
-      remaining = (uint32_t) ( ptimer->Timer.expire - now );
+  if (ptimer->clock_type == CLOCK_MONOTONIC) {
+  _Timecounter_Nanouptime(now);
+  }
+  if (ptimer->clock_type == CLOCK_REALTIME) {
+    _TOD_Get(now);
+  }
+
+
+ if( rtems_timespec_less_than( now, expire )) {
+      rtems_timespec_subtract(now, expire, result);
     } else {
-      remaining = 0;
+      result->tv_nsec=0;
+      result->tv_sec=0;
     }
+  
+  (*value).it_value=*result;
+  value->it_interval = ptimer->timer_data.it_interval;
+  
+  _POSIX_Timer_Release(cpu, &lock_context);
+  return 0;
+}
+
+
+
+
 
-    _Timespec_From_ticks( remaining, &value->it_value );
-    value->it_interval = ptimer->timer_data.it_interval;
 
-    _POSIX_Timer_Release( cpu, &lock_context );
-    return 0;
-  }
 
-  rtems_set_errno_and_return_minus_one( EINVAL );
-}
-- 
2.32.0