Merge pull request ckolivas#268 from luke-jr/bf_generic_kname

bitforce: Use "full work" vs "nonce range" for kernel name
Tydus · Jul 29, 2012 · 150b29d · 150b29d
2 parents 6b80592 + b347a17
commit 150b29d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git 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 @@ static bool bitforce_send_work(struct thr_info *thr, struct work *work)
 			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);