Commit a821df6a27b7815de2c24f87e26d909f94d574b7

Con Kolivas 2013-10-27T13:41:50

Correctly calculate sleep_estimate in usbutils that may have been preventing usecps from working.

diff --git a/usbutils.c b/usbutils.c
index 17c1d74..4c21e36 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -2495,14 +2495,14 @@ int _usb_read(struct cgpu_info *cgpu, int intinfo, int epinfo, char *buf, size_t
 				cgtimer_t now, already_done;
 				double sleep_estimate;
 				double write_time = (double)(usbdev->last_write_siz) /
-						    (double)(usbdev->cps);
+						    (double)(usbdev->cps) * 1000;
 
 				cgtimer_time(&now);
 				cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done);
 				sleep_estimate = write_time - cgtimer_to_ms(&already_done);
 
 				if (sleep_estimate > 0.0) {
-					cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
+					cgsleep_ms_r(&usbdev->cgt_last_write, write_time);
 					cgpu->usbinfo.read_delay_count++;
 					cgpu->usbinfo.total_read_delay += sleep_estimate;
 				}
@@ -2596,14 +2596,14 @@ int _usb_read(struct cgpu_info *cgpu, int intinfo, int epinfo, char *buf, size_t
 			cgtimer_t now, already_done;
 			double sleep_estimate;
 			double write_time = (double)(usbdev->last_write_siz) /
-					    (double)(usbdev->cps);
+					    (double)(usbdev->cps) * 1000;
 
 			cgtimer_time(&now);
 			cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done);
 			sleep_estimate = write_time - cgtimer_to_ms(&already_done);
 
 			if (sleep_estimate > 0.0) {
-				cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
+				cgsleep_ms_r(&usbdev->cgt_last_write, write_time);
 				cgpu->usbinfo.read_delay_count++;
 				cgpu->usbinfo.total_read_delay += sleep_estimate;
 			}
@@ -2743,14 +2743,14 @@ int _usb_write(struct cgpu_info *cgpu, int intinfo, int epinfo, char *buf, size_
 				cgtimer_t now, already_done;
 				double sleep_estimate;
 				double write_time = (double)(usbdev->last_write_siz) /
-						    (double)(usbdev->cps);
+						    (double)(usbdev->cps) * 1000;
 
 				cgtimer_time(&now);
 				cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done);
 				sleep_estimate = write_time - cgtimer_to_ms(&already_done);
 
 				if (sleep_estimate > 0.0) {
-					cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
+					cgsleep_ms_r(&usbdev->cgt_last_write, write_time);
 					cgpu->usbinfo.write_delay_count++;
 					cgpu->usbinfo.total_write_delay += sleep_estimate;
 				}
@@ -2882,14 +2882,14 @@ int __usb_transfer(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bReques
 			cgtimer_t now, already_done;
 			double sleep_estimate;
 			double write_time = (double)(usbdev->last_write_siz) /
-					    (double)(usbdev->cps);
+					    (double)(usbdev->cps) * 1000;
 
 			cgtimer_time(&now);
 			cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done);
 			sleep_estimate = write_time - cgtimer_to_ms(&already_done);
 
 			if (sleep_estimate > 0.0) {
-				cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
+				cgsleep_ms_r(&usbdev->cgt_last_write, write_time);
 				cgpu->usbinfo.write_delay_count++;
 				cgpu->usbinfo.total_write_delay += sleep_estimate;
 			}
@@ -2964,14 +2964,14 @@ int _usb_transfer_read(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bRe
 		cgtimer_t now, already_done;
 		double sleep_estimate;
 		double write_time = (double)(usbdev->last_write_siz) /
-				    (double)(usbdev->cps);
+				    (double)(usbdev->cps) * 1000;
 
 		cgtimer_time(&now);
 		cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done);
 		sleep_estimate = write_time - cgtimer_to_ms(&already_done);
 
 		if (sleep_estimate > 0.0) {
-			cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
+			cgsleep_ms_r(&usbdev->cgt_last_write, write_time);
 			cgpu->usbinfo.read_delay_count++;
 			cgpu->usbinfo.total_read_delay += sleep_estimate;
 		}