X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fhelper%2Ftime_support.c;h=922d411d7561f8671645c3310468f105da953133;hb=d61714f4d5d72f9f39fbccbb1c3ba5f3d8982020;hp=9615817fc591cc04964fdded03a425ab4dea2e61;hpb=5ed126c4f90948fbf53d186dc4ef49018fb5ecfc;p=fw%2Fopenocd

diff --git a/src/helper/time_support.c b/src/helper/time_support.c
index 9615817fc..922d411d7 100644
--- a/src/helper/time_support.c
+++ b/src/helper/time_support.c
@@ -2,6 +2,12 @@
  *   Copyright (C) 2006 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -24,13 +30,6 @@
 #include "time_support.h"
 #include "log.h"
 
-#include <stdlib.h>
-#include <sys/time.h>
-#include <time.h>
-
-int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
-int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y);
-int timeval_add_time(struct timeval *result, int sec, int usec);
 
 /* calculate difference between two struct timeval values */
 int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y)
@@ -84,11 +83,9 @@ int timeval_add_time(struct timeval *result, int sec, int usec)
 	return 0;
 }
 
-int duration_start_measure(duration_t *duration)
+void duration_start_measure(duration_t *duration)
 {
 	gettimeofday(&duration->start, NULL);
-	
-	return ERROR_OK;
 }
 
 int duration_stop_measure(duration_t *duration, char **text)
@@ -101,9 +98,24 @@ int duration_stop_measure(duration_t *duration, char **text)
 	
 	if (text)
 	{
-		*text = malloc(16);
-		snprintf(*text, 16, "%lis %lius", duration->duration.tv_sec, duration->duration.tv_usec);
+		float t;
+		t=duration->duration.tv_sec;
+		t += (float)duration->duration.tv_usec/1000000.0;
+		*text = malloc(100);
+		snprintf(*text, 100, "%fs", t);
 	}
 	
 	return ERROR_OK;
 }
+
+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;
+}