don't require 'openocd.cfg' to start

[fw/openocd] / src / helper / time_support.c

diff --git a/src/helper/time_support.c b/src/helper/time_support.c
index 9b86e52fe9ec224fb909b166e03e52a974baf347..19343157c96a806d05cdbcb2379d1966a39c07e8 100644 (file)
--- a/src/helper/time_support.c
+++ b/src/helper/time_support.c
@@ -29,7 +29,6 @@
 
 #include "time_support.h"
 
-
 /* calculate difference between two struct timeval values */
 int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y)
 {
@@ -55,20 +54,11 @@ int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *
 /* add two struct timeval values */
 int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y)
 {
-       result->tv_sec = x->tv_sec + y->tv_sec;
-
-       result->tv_usec = x->tv_usec + y->tv_usec;
-
-       while (result->tv_usec > 1000000)
-       {
-               result->tv_usec -= 1000000;
-               result->tv_sec++;
-       }
-
-       return 0;
+       memcpy(result, x, sizeof(struct timeval));
+       return timeval_add_time(result, y->tv_sec, y->tv_usec);
 }
 
-int timeval_add_time(struct timeval *result, int sec, int usec)
+int timeval_add_time(struct timeval *result, long sec, long usec)
 {
        result->tv_sec += sec;
        result->tv_usec += usec;
@@ -107,15 +97,3 @@ float duration_kbps(struct duration *duration, size_t count)
 {
        return count / (1024.0 * duration_elapsed(duration));
 }
-
-long long timeval_ms()
-{
-       struct timeval now;
-       long long t = 0;
-       gettimeofday(&now, NULL);
-
-       t += now.tv_usec/1000;
-       t += now.tv_sec*1000;
-
-       return t;
-}