|
|
@ -387,7 +387,7 @@ static int icarus_get_nonce(struct cgpu_info *icarus, unsigned char *buf, struct |
|
|
|
err = usb_read_timeout(icarus, (char *)buf, read_amount, &amt, ICARUS_WAIT_TIMEOUT, C_GETRESULTS); |
|
|
|
err = usb_read_timeout(icarus, (char *)buf, read_amount, &amt, ICARUS_WAIT_TIMEOUT, C_GETRESULTS); |
|
|
|
cgtime(&read_finish); |
|
|
|
cgtime(&read_finish); |
|
|
|
if (err < 0 && err != LIBUSB_ERROR_TIMEOUT) { |
|
|
|
if (err < 0 && err != LIBUSB_ERROR_TIMEOUT) { |
|
|
|
applog(LOG_ERR, "%s%i: Comms error (err=%d amt=%d)", |
|
|
|
applog(LOG_ERR, "%s%i: Comms error (rerr=%d amt=%d)", |
|
|
|
icarus->drv->name, icarus->device_id, err, amt); |
|
|
|
icarus->drv->name, icarus->device_id, err, amt); |
|
|
|
dev_error(icarus, REASON_DEV_COMMS_ERROR); |
|
|
|
dev_error(icarus, REASON_DEV_COMMS_ERROR); |
|
|
|
return ICA_NONCE_ERROR; |
|
|
|
return ICA_NONCE_ERROR; |
|
|
@ -860,7 +860,7 @@ static int64_t icarus_scanhash(struct thr_info *thr, struct work *work, |
|
|
|
|
|
|
|
|
|
|
|
err = usb_write(icarus, (char *)ob_bin, sizeof(ob_bin), &amount, C_SENDWORK); |
|
|
|
err = usb_write(icarus, (char *)ob_bin, sizeof(ob_bin), &amount, C_SENDWORK); |
|
|
|
if (err < 0 || amount != sizeof(ob_bin)) { |
|
|
|
if (err < 0 || amount != sizeof(ob_bin)) { |
|
|
|
applog(LOG_ERR, "%s%i: Comms error (err=%d amt=%d)", |
|
|
|
applog(LOG_ERR, "%s%i: Comms error (werr=%d amt=%d)", |
|
|
|
icarus->drv->name, icarus->device_id, err, amount); |
|
|
|
icarus->drv->name, icarus->device_id, err, amount); |
|
|
|
dev_error(icarus, REASON_DEV_COMMS_ERROR); |
|
|
|
dev_error(icarus, REASON_DEV_COMMS_ERROR); |
|
|
|
icarus_initialise(icarus, info->baud); |
|
|
|
icarus_initialise(icarus, info->baud); |
|
|
|