Commit edcea78a61c5d39a59fbccdd3f0b815d04469215
2013-09-25T16:28:34
Define a mandatory upper limit to waiting for reset and data on BF1 based on full nonce duration.
diff --git a/driver-bitfury.c b/driver-bitfury.c
index e4dabf4..5cd4d8b 100644
--- a/driver-bitfury.c
+++ b/driver-bitfury.c
@@ -13,6 +13,8 @@
#include "driver-bitfury.h"
#include "sha2.h"
+/* Wait longer 1/3 longer than it would take for a full nonce range */
+#define BF1WAIT 1600
struct device_drv bitfury_drv;
static void bitfury_open(struct cgpu_info *bitfury)
@@ -88,7 +90,7 @@ static bool bitfury_detect_one(struct libusb_device *dev, struct usb_find_device
/* Send reset request */
usb_write(bitfury, "R", 1, &amount, C_BFO_REQRESET);
- usb_read_timeout(bitfury, buf, 7, &amount, 1000, C_BFO_GETRESET);
+ usb_read_timeout(bitfury, buf, 7, &amount, BF1WAIT, C_BFO_GETRESET);
if (amount != 7) {
applog(LOG_WARNING, "%s%d: Getreset received %d bytes",
@@ -235,7 +237,7 @@ static int64_t bitfury_scanhash(struct thr_info *thr, struct work *work,
return 0;
}
- usb_read_once_timeout(bitfury, buf, 7, &amount, 2000, C_PING);
+ usb_read_once_timeout(bitfury, buf, 7, &amount, BF1WAIT, C_PING);
tot = amount;
while (amount) {
usb_read_once_timeout(bitfury, buf + tot, 512, &amount, 10, C_PING);