Commit 21fa38d587cae34b389cd92f28867922e22b5ed1
2014-02-23T23:52:54
Read off the OP_NAME if it exists and is supported on hfa devices, setting it to the device serial number or a timestamp if it is invalid.
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 90 91 92 93 94 95 96 97 98 99 100 101 102 103
diff --git a/driver-hashfast.c b/driver-hashfast.c
index 07f01e7..d75d334 100644
--- a/driver-hashfast.c
+++ b/driver-hashfast.c
@@ -132,7 +132,8 @@ static const struct hfa_cmd hfa_cmds[] = {
{OP_PING, "OP_PING", C_HF_PING},
{OP_CORE_MAP, "OP_CORE_MAP", C_NULL},
{OP_VERSION, "OP_VERSION", C_NULL}, // 32
- {OP_FAN, "OP_FAN", C_HF_FAN}
+ {OP_FAN, "OP_FAN", C_HF_FAN},
+ {OP_NAME, "OP_NAME", C_OP_NAME}
};
#define HF_USB_CMD_OFFSET (128 - 18)
@@ -308,6 +309,24 @@ static const char *hf_usb_init_errors[] = {
"Timeout after mixed reconfiguration"
};
+static bool hfa_clear_readbuf(struct cgpu_info *hashfast);
+
+/* If no opname or an invalid opname is set, change it to the serial number if
+ * it exists, or a random name based on timestamp if not. */
+static void hfa_choose_opname(struct hashfast_info *info)
+{
+ struct timeval tv_now;
+ uint64_t usecs;
+
+ if (info->serial_number) {
+ sprintf(info->op_name, "%x", info->serial_number);
+ return;
+ }
+ cgtime(&tv_now);
+ usecs = (uint64_t)(tv_now.tv_sec) * (uint64_t)1000000 + (uint64_t)tv_now.tv_usec;
+ sprintf(info->op_name, "%"PRIu64, usecs);
+}
+
static bool hfa_reset(struct cgpu_info *hashfast, struct hashfast_info *info)
{
struct hf_usb_init_header usb_init[2], *hu = usb_init;
@@ -459,6 +478,39 @@ tryagain:
info->serial_number = db->serial_number;
info->base_clock = db->hash_clockrate;
+ hfa_clear_readbuf(hashfast);
+
+ /* Try sending and receiving an OP_NAME */
+ if (!hfa_send_frame(hashfast, HF_USB_CMD(OP_NAME), 0, (uint8_t *)NULL, 0)) {
+ applog(LOG_WARNING, "%s %d: Failed to send OP_NAME!", hashfast->drv->name,
+ hashfast->device_id);
+ return false;
+ }
+ ret = hfa_get_header(hashfast, h, &hcrc);
+ if (!ret) {
+ applog(LOG_WARNING, "%s %d: Failed to receive OP_NAME response", hashfast->drv->name,
+ hashfast->device_id);
+ return false;
+ }
+ /* Only try to parse the name if the firmware supports OP_NAME */
+ if (h->operation_code == OP_NAME) {
+ if (!hfa_get_data(hashfast, info->op_name, 32)) {
+ applog(LOG_WARNING, "%s %d: OP_NAME failed! Failure to get op_name data",
+ hashfast->drv->name, hashfast->device_id);
+ return false;
+ }
+ for (i = 0; i < 32; i++) {
+ if (i > 0 && info->op_name[i] == '\0')
+ break;
+ /* Make sure the op_name is valid ascii only */
+ if (info->op_name[i] < 32 || info->op_name[i] > 126) {
+ hfa_choose_opname(info);
+ break;
+ }
+ }
+ applog(LOG_INFO, "%s %d: Opname set to %s", hashfast->drv->name,
+ hashfast->device_id, info->op_name);
+ }
return true;
}
diff --git a/driver-hashfast.h b/driver-hashfast.h
index ae1ab89..be8f141 100644
--- a/driver-hashfast.h
+++ b/driver-hashfast.h
@@ -115,6 +115,7 @@ struct hashfast_info {
int group_ntime_roll; // Total ntime roll amount per group
int core_ntime_roll; // Total core ntime roll amount
uint32_t serial_number; // db->serial_number if it exists
+ char op_name[36];
pthread_mutex_t lock;
pthread_mutex_t rlock;
diff --git a/usbutils.h b/usbutils.h
index 14c5605..c7b86ea 100644
--- a/usbutils.h
+++ b/usbutils.h
@@ -390,6 +390,7 @@ struct cg_usb_info {
USB_ADD_COMMAND(C_HF_NOTICE, "HFNotice") \
USB_ADD_COMMAND(C_HF_PING, "HFPing") \
USB_ADD_COMMAND(C_HF_FAN, "HFFan") \
+ USB_ADD_COMMAND(C_OP_NAME, "HFName") \
USB_ADD_COMMAND(C_HF_GETHEADER, "HFGetHeader") \
USB_ADD_COMMAND(C_HF_GETDATA, "HFGetData") \
USB_ADD_COMMAND(C_HF_CLEAR_READ, "HFClearRead") \