X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Ftime_support.c;h=f7e9352238077b17db03bdd6c127c0767c93c359;hb=665ac60ef0289ebc520126872efac6bbdf831f61;hp=9b86e52fe9ec224fb909b166e03e52a974baf347;hpb=2689f58f2a0afa296a29ab301a4c1665b914caab;p=openocd.git diff --git a/src/helper/time_support.c b/src/helper/time_support.c index 9b86e52fe9..f7e9352238 100644 --- a/src/helper/time_support.c +++ b/src/helper/time_support.c @@ -23,18 +23,17 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "time_support.h" - /* calculate difference between two struct timeval values */ int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y) { - if (x->tv_usec < y->tv_usec) - { + if (x->tv_usec < y->tv_usec) { int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1; y->tv_usec -= 1000000 * nsec; y->tv_sec += nsec; @@ -52,29 +51,12 @@ int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval * return x->tv_sec < y->tv_sec; } -/* 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; -} - -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; - while (result->tv_usec > 1000000) - { + while (result->tv_usec > 1000000) { result->tv_usec -= 1000000; result->tv_sec++; } @@ -107,15 +89,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; -}