X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Ftime_support.c;h=c5978b423f634fea0d2dddb58d49e392f35a12f7;hp=693528fe1954c1398cd6967b50be061caa9948c5;hb=8e4c80c17d6abea8754ab29aa5285ae10e6e273b;hpb=0cd414c7d69361768cf0a8b2c1844a8bb2354c8c diff --git a/src/helper/time_support.c b/src/helper/time_support.c index 693528fe19..c5978b423f 100644 --- a/src/helper/time_support.c +++ b/src/helper/time_support.c @@ -21,20 +21,19 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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,20 +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) -{ - memcpy(result, x, sizeof(struct timeval)); - return timeval_add_time(result, y->tv_sec, y->tv_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++; } @@ -73,16 +64,6 @@ int timeval_add_time(struct timeval *result, long sec, long usec) return 0; } -int64_t timeval_ms() -{ - struct timeval now; - int retval = gettimeofday(&now, NULL); - if (retval < 0) - return retval; - return (int64_t)now.tv_sec * 1000 + now.tv_usec / 1000; -} - - int duration_start(struct duration *duration) { return gettimeofday(&duration->start, NULL);