Changes in uspace/drv/bus/usb/usbdiag/tests.c [205f1add:3bacee1] in mainline

File:

• uspace/drv/bus/usb/usbdiag/tests.c (modified) (4 diffs)

uspace/drv/bus/usb/usbdiag/tests.c

@@ -72 +72 @@
         uint32_t transfer_count = 0;
 
-        struct timespec start_time, final_time, stop_time;
-        getuptime(&start_time);
-        getuptime(&stop_time);
-
-        ts_add_diff(&stop_time, MSEC2NSEC(params->min_duration));
-        getuptime(&final_time);
-
-        while (!ts_gt(&final_time, &stop_time)) {
+        struct timeval start_time, final_time, stop_time;
+        gettimeofday(&start_time, NULL);
+        gettimeofday(&stop_time, NULL);
+
+        tv_add_diff(&stop_time, params->min_duration * 1000);
+        gettimeofday(&final_time, NULL);
+
+        while (!tv_gt(&final_time, &stop_time)) {
                 ++transfer_count;
 
@@ -121 +121 @@
                 }
 
-                getuptime(&final_time);
-        }
-
-        usbdiag_dur_t in_duration = NSEC2MSEC(final_time.tv_nsec - start_time.tv_nsec) +
-            SEC2MSEC(final_time.tv_sec - start_time.tv_sec);
+                gettimeofday(&final_time, NULL);
+        }
+
+        usbdiag_dur_t in_duration = ((final_time.tv_usec - start_time.tv_usec) / 1000) +
+            ((final_time.tv_sec - start_time.tv_sec) * 1000);
 
         usb_log_info("Test on %s IN endpoint completed in %lu ms.", usb_str_transfer_type(pipe->desc.transfer_type), in_duration);
@@ -170 +170 @@
         uint32_t transfer_count = 0;
 
-        struct timespec start_time, final_time, stop_time;
-        getuptime(&start_time);
-        getuptime(&stop_time);
-
-        ts_add_diff(&stop_time, MSEC2NSEC(params->min_duration));
-        getuptime(&final_time);
-
-        while (!ts_gt(&final_time, &stop_time)) {
+        struct timeval start_time, final_time, stop_time;
+        gettimeofday(&start_time, NULL);
+        gettimeofday(&stop_time, NULL);
+
+        tv_add_diff(&stop_time, params->min_duration * 1000);
+        gettimeofday(&final_time, NULL);
+
+        while (!tv_gt(&final_time, &stop_time)) {
                 ++transfer_count;
 
@@ -186 +186 @@
                 }
 
-                getuptime(&final_time);
-        }
-
-        usbdiag_dur_t in_duration = NSEC2MSEC(final_time.tv_nsec - start_time.tv_nsec) +
-            SEC2MSEC(final_time.tv_sec - start_time.tv_sec);
+                gettimeofday(&final_time, NULL);
+        }
+
+        usbdiag_dur_t in_duration = ((final_time.tv_usec - start_time.tv_usec) / 1000) +
+            ((final_time.tv_sec - start_time.tv_sec) * 1000);
 
         usb_log_info("Test on %s OUT endpoint completed in %ld ms.", usb_str_transfer_type(pipe->desc.transfer_type), in_duration);