1 files changed, 8 insertions, 39 deletions
diff --git a/osdep/timer-linux.c b/osdep/timer-linux.c
index 8c1af557a0..073ca84182 100644
--- a/osdep/timer-linux.c
+++ b/osdep/timer-linux.c
@@ -27,8 +27,9 @@
 #include <time.h>
 #include <sys/time.h>
 #include "config.h"
+#include "timer.h"
 
-const char *timer_name =
+const char timer_name[] =
 #ifdef HAVE_NANOSLEEP
     "nanosleep()";
 #else
@@ -50,52 +51,20 @@ int usec_sleep(int usec_delay)
 // Returns current time in microseconds
 unsigned int GetTimer(void)
 {
-    struct timeval tv;
-    //float s;
-    gettimeofday(&tv,NULL);
-    //s = tv.tv_usec; s *= 0.000001; s += tv.tv_sec;
-    return tv.tv_sec * 1000000 + tv.tv_usec;
+  struct timeval tv;
+  gettimeofday(&tv,NULL);
+  return tv.tv_sec * 1000000 + tv.tv_usec;
 }
 
 // Returns current time in milliseconds
 unsigned int GetTimerMS(void)
 {
-    struct timeval tv;
-    //float s;
-    gettimeofday(&tv,NULL);
-    //s = tv.tv_usec; s *= 0.000001; s += tv.tv_sec;
-    return tv.tv_sec * 1000 + tv.tv_usec / 1000;
-}
-
-static unsigned int RelativeTime = 0;
-
-// Returns time spent between now and last call in seconds
-float GetRelativeTime(void)
-{
-    unsigned int t,r;
-    t = GetTimer();
-    //t *= 16; printf("time = %ud\n", t);
-    r = t - RelativeTime;
-    RelativeTime = t;
-    return (float) r * 0.000001F;
+  struct timeval tv;
+  gettimeofday(&tv,NULL);
+  return tv.tv_sec * 1000 + tv.tv_usec / 1000;
 }
 
 // Initialize timer, must be called at least once at start
 void InitTimer(void)
 {
-    GetRelativeTime();
 }
-
-
-#if 0
-#include <stdio.h>
-int main(void)
-{
-    float t = 0;
-    InitTimer();
-    while (1) {
-        t += GetRelativeTime();
-        printf("time = %10.6f\r", t);
-        fflush(stdout); }
-}
-#endif