Commit 1bafafb5d3a91f7074930f9b1eb4eb0ccd2398ce
2013-10-21T11:05:38
Enable USB buffers for hashfast on initialise and clear buffers where appropriate.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85
diff --git a/driver-hashfast.c b/driver-hashfast.c
index cef12b7..c89de22 100644
--- a/driver-hashfast.c
+++ b/driver-hashfast.c
@@ -288,6 +288,21 @@ static bool hfa_reset(struct cgpu_info *hashfast, struct hashfast_info *info)
return true;
}
+static void hfa_send_shutdown(struct cgpu_info *hashfast)
+{
+ hfa_send_frame(hashfast, HF_USB_CMD(OP_USB_SHUTDOWN), 0, NULL, 0);
+}
+
+static void hfa_clear_readbuf(struct cgpu_info *hashfast)
+{
+ int amount, ret;
+ char buf[512];
+
+ do {
+ ret = usb_read(hashfast, buf, 512, &amount, C_HF_CLEAR_READ);
+ } while (!ret || amount);
+}
+
static bool hfa_detect_common(struct cgpu_info *hashfast)
{
struct hashfast_info *info;
@@ -297,9 +312,12 @@ static bool hfa_detect_common(struct cgpu_info *hashfast)
if (!info)
quit(1, "Failed to calloc hashfast_info in hfa_detect_common");
hashfast->device_data = info;
+ hfa_clear_readbuf(hashfast);
/* hashfast_reset should fill in details for info */
ret = hfa_reset(hashfast, info);
if (!ret) {
+ hfa_send_shutdown(hashfast);
+ hfa_clear_readbuf(hashfast);
free(info);
hashfast->device_data = NULL;
return false;
@@ -326,6 +344,7 @@ static void hfa_initialise(struct cgpu_info *hashfast)
{
if (hashfast->usbinfo.nodev)
return;
+ usb_buffer_enable(hashfast);
// FIXME Do necessary initialising here
}
@@ -812,9 +831,8 @@ static struct api_data *hfa_api_stats(struct cgpu_info *cgpu)
return root;
}
-static void hfa_init(struct cgpu_info *hashfast)
+static void hfa_init(struct cgpu_info __maybe_unused *hashfast)
{
- usb_buffer_enable(hashfast);
}
static void hfa_free_all_work(struct hashfast_info *info)
@@ -836,9 +854,11 @@ static void hfa_shutdown(struct thr_info *thr)
struct cgpu_info *hashfast = thr->cgpu;
struct hashfast_info *info = hashfast->device_data;
- hfa_send_frame(hashfast, HF_USB_CMD(OP_USB_SHUTDOWN), 0, NULL, 0);
+ hfa_send_shutdown(hashfast);
pthread_join(info->read_thr, NULL);
hfa_free_all_work(info);
+ hfa_clear_readbuf(hashfast);
+ usb_buffer_disable(hashfast);
}
struct device_drv hashfast_drv = {
diff --git a/usbutils.h b/usbutils.h
index 9000ad8..e383f1a 100644
--- a/usbutils.h
+++ b/usbutils.h
@@ -362,7 +362,8 @@ struct cg_usb_info {
USB_ADD_COMMAND(C_HF_WORK_RESTART, "HFWorkRestart") \
USB_ADD_COMMAND(C_HF_GWQSTATS, "HFGWQStats") \
USB_ADD_COMMAND(C_HF_GETHEADER, "HFGetHeader") \
- USB_ADD_COMMAND(C_HF_GETDATA, "HFGetData")
+ USB_ADD_COMMAND(C_HF_GETDATA, "HFGetData") \
+ USB_ADD_COMMAND(C_HF_CLEAR_READ, "HFClearRead")
/* Create usb_cmds enum from USB_PARSE_COMMANDS macro */
enum usb_cmds {