Commit 58dd80e459f4b7c1b214c618ee709aeeb0ab47c9
2013-10-13T21:39:59
Implement a hashfast get_header function which reads till it finds a header preamble or times out.
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 86 87 88 89
diff --git a/driver-hashfast.c b/driver-hashfast.c
index e6820e1..9d144d1 100644
--- a/driver-hashfast.c
+++ b/driver-hashfast.c
@@ -138,13 +138,44 @@ static bool hashfast_send_header(struct cgpu_info *hashfast, struct hf_header *h
len = sizeof(*h);
ret = usb_write(hashfast, (char *)h, len, &amount, hf_cmds[cmd].usb_cmd);
if (ret < 0 || amount != len) {
- applog(LOG_WARNING, "HFA%d: send_header: USB Send error, ret %d amount %d vs. length %d",
- hashfast->device_id, ret, amount, len);
+ applog(LOG_WARNING, "HFA%d: send_header: %s USB Send error, ret %d amount %d vs. length %d",
+ hashfast->device_id, hf_cmds[cmd].cmd_name, ret, amount, len);
return false;
}
return true;
}
+static bool hashfast_get_header(struct cgpu_info *hashfast, struct hf_header *h,
+ uint8_t *computed_crc)
+{
+ int amount, ret, orig_len, len, ofs = 0, reads = 0;
+ char buf[512];
+ char *header;
+
+ /* Read for up to 200ms till we find the first occurrence of HF_PREAMBLE
+ * though it should be the first byte unless we get woefully out of
+ * sync. */
+ orig_len = len = sizeof(*h);
+ do {
+
+ if (++reads > 20)
+ return false;
+
+ ret = usb_read_timeout(hashfast, buf + ofs, len, &amount, 10, C_HF_GETHEADER);
+ if (unlikely(ret))
+ return false;
+ ofs += amount;
+ header = memchr(buf, HF_PREAMBLE, ofs);
+ if (header)
+ len -= ofs - (header - buf);
+ } while (len);
+
+ memcpy(h, header, orig_len);
+ *computed_crc = hf_crc8((uint8_t *)h);
+
+ return true;
+}
+
static bool hashfast_reset(struct cgpu_info *hashfast, struct hashfast_info *info)
{
struct hf_usb_init_header usb_init, *hu = &usb_init;
@@ -154,6 +185,7 @@ static bool hashfast_reset(struct cgpu_info *hashfast, struct hashfast_info *inf
uint8_t hcrc;
uint8_t addr;
uint16_t hdata;
+ int i;
info->hash_clock_rate = 550; // Hash clock rate in Mhz
// Assemble the USB_INIT request
@@ -169,6 +201,14 @@ static bool hashfast_reset(struct cgpu_info *hashfast, struct hashfast_info *inf
if (!hashfast_send_header(hashfast, (struct hf_header *)hu, HF_USB_CMD(OP_USB_INIT)))
return false;
+ // Check for the correct response.
+ // We extend the normal timeout - a complete device initialization, including
+ // bringing power supplies up from standby, etc., can take over a second.
+ for (i = 0; i < 30; i++) {
+ if (hashfast_get_header(hashfast, h, &hcrc))
+ break;
+ }
+
return true;
}
diff --git a/usbutils.h b/usbutils.h
index b9bab1c..d3546ac 100644
--- a/usbutils.h
+++ b/usbutils.h
@@ -359,7 +359,9 @@ struct cg_usb_info {
USB_ADD_COMMAND(C_HF_DIE_STATUS, "HFDieStatus") \
USB_ADD_COMMAND(C_HF_GWQ_STATUS, "HFGWQStatus") \
USB_ADD_COMMAND(C_HF_WORK_RESTART, "HFWorkRestart") \
- USB_ADD_COMMAND(C_HF_GWQSTATS, "HFGWQStats")
+ USB_ADD_COMMAND(C_HF_GWQSTATS, "HFGWQStats") \
+ USB_ADD_COMMAND(C_HF_GETHEADER, "HFGetHeader") \
+ USB_ADD_COMMAND(C_HF_GETDATA, "HFGetData")
/* Create usb_cmds enum from USB_PARSE_COMMANDS macro */
enum usb_cmds {