Commit 150b29d44593c204a466aef08c3436c7fc7abb5e
2012-07-29T03:44:07
Merge pull request #268 from luke-jr/bf_generic_kname bitforce: Use "full work" vs "nonce range" for kernel name
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
diff --git a/driver-bitforce.c b/driver-bitforce.c
index ff53720..123c5fc 100644
--- a/driver-bitforce.c
+++ b/driver-bitforce.c
@@ -32,6 +32,9 @@
#define tv_to_ms(tval) (tval.tv_sec * 1000 + tval.tv_usec / 1000)
#define TIME_AVG_CONSTANT 8
+#define KNAME_WORK "full work"
+#define KNAME_RANGE "nonce range"
+
struct device_api bitforce_api;
// Code must deal with a timeout
@@ -95,10 +98,10 @@ static bool bitforce_detect_one(const char *devpath)
if (opt_bfl_noncerange) {
bitforce->nonce_range = true;
bitforce->sleep_ms = BITFORCE_SLEEP_MS;
- bitforce->kname = "Mini-rig";
+ bitforce->kname = KNAME_RANGE;
} else {
bitforce->sleep_ms = BITFORCE_SLEEP_MS * 5;
- bitforce->kname = "Single";
+ bitforce->kname = KNAME_WORK;
}
if (likely((!memcmp(pdevbuf, ">>>ID: ", 7)) && (s = strstr(pdevbuf + 3, ">>>")))) {
@@ -292,7 +295,7 @@ re_send:
applog(LOG_WARNING, "BFL%i: Does not support nonce range, disabling", bitforce->device_id);
bitforce->nonce_range = false;
bitforce->sleep_ms *= 5;
- bitforce->kname = "Single";
+ bitforce->kname = KNAME_WORK;
goto re_send;
}
applog(LOG_ERR, "BFL%i: Error: Send work reports: %s", bitforce->device_id, pdevbuf);
@@ -440,7 +443,7 @@ static int64_t bitforce_get_result(struct thr_info *thr, struct work *work)
bitforce->nonce_range = false;
work->blk.nonce = 0xffffffff;
bitforce->sleep_ms *= 5;
- bitforce->kname = "Single";
+ bitforce->kname = KNAME_WORK;
}
submit_nonce(thr, work, nonce);