target: use correct target in target-prefixed commands and event handlers

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

diff --git a/src/helper/time_support.c b/src/helper/time_support.c
index 693528fe1954c1398cd6967b50be061caa9948c5..05eaf0a9d08e4cfae9a1dddf28c12d906813a2fb 100644 (file)
--- a/src/helper/time_support.c
+++ b/src/helper/time_support.c
@@ -19,22 +19,19 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   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.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #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 +49,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 +62,21 @@ int timeval_add_time(struct timeval *result, long sec, long usec)
        return 0;
 }
 
-int64_t timeval_ms()
+/* compare two timevals and return -1/0/+1 accordingly */
+int timeval_compare(const struct timeval *x, const struct timeval *y)
 {
-       struct timeval now;
-       int retval = gettimeofday(&now, NULL);
-       if (retval < 0)
-               return retval;
-       return (int64_t)now.tv_sec * 1000 + now.tv_usec / 1000;
+       if (x->tv_sec < y->tv_sec)
+               return -1;
+       else if (x->tv_sec > y->tv_sec)
+               return 1;
+       else if (x->tv_usec < y->tv_usec)
+               return -1;
+       else if (x->tv_usec > y->tv_usec)
+               return 1;
+       else
+               return 0;
 }
 
-
 int duration_start(struct duration *duration)
 {
        return gettimeofday(&duration->start, NULL);
@@ -97,14 +91,14 @@ int duration_measure(struct duration *duration)
        return retval;
 }
 
-float duration_elapsed(struct duration *duration)
+float duration_elapsed(const struct duration *duration)
 {
        float t = duration->elapsed.tv_sec;
        t += (float)duration->elapsed.tv_usec / 1000000.0;
        return t;
 }
 
-float duration_kbps(struct duration *duration, size_t count)
+float duration_kbps(const struct duration *duration, size_t count)
 {
        return count / (1024.0 * duration_elapsed(duration));
 }