Commit 3e54c866244884f9f7612d1985d9c817fb21fc25
2014-06-28T10:09:31
Parse results for BMA based on uid and remove work from the queue when found
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-bflsc.c b/driver-bflsc.c
index f35513b..70827e3 100644
--- a/driver-bflsc.c
+++ b/driver-bflsc.c
@@ -1265,10 +1265,27 @@ static void inc_bflsc_nonces(struct bflsc_info *info, int8_t core)
info->core_nonces[core]++;
}
+struct work *bflsc_work_by_uid(struct cgpu_info *bflsc, struct bflsc_info *sc_info, int id)
+{
+ struct bflsc_work *bwork;
+ struct work *work = NULL;
+
+ wr_lock(&bflsc->qlock);
+ HASH_FIND_INT(sc_info->bworks, &id, bwork);
+ if (likely(bwork)) {
+ HASH_DEL(sc_info->bworks, bwork);
+ work = bwork->work;
+ free(bwork);
+ __work_completed(bflsc, work);
+ }
+ wr_unlock(&bflsc->qlock);
+
+ return work;
+}
+
static void process_nonces(struct cgpu_info *bflsc, int dev, char *xlink, char *data, int count, char **fields, int *nonces)
{
struct bflsc_info *sc_info = (struct bflsc_info *)(bflsc->device_data);
- char midstate[MIDSTATE_BYTES], blockdata[MERKLE_BYTES];
struct thr_info *thr = bflsc->thr[0];
struct work *work;
int8_t core = -1;
@@ -1312,18 +1329,26 @@ static void process_nonces(struct cgpu_info *bflsc, int dev, char *xlink, char *
inc_bflsc_errors(thr, sc_info, core);
}
- memset(midstate, 0, MIDSTATE_BYTES);
- memset(blockdata, 0, MERKLE_BYTES);
- if (!hex2bin((unsigned char *)midstate, fields[QUE_MIDSTATE], MIDSTATE_BYTES) ||
- !hex2bin((unsigned char *)blockdata, fields[QUE_BLOCKDATA], MERKLE_BYTES)) {
- applog(LOG_INFO, "%s%i:%s Failed to convert binary data to hex result - ignored",
- bflsc->drv->name, bflsc->device_id, xlink);
- inc_bflsc_errors(thr, sc_info, core);
- return;
- }
+ if (usb_ident(bflsc) == IDENT_BMA) {
+ int uid;
+
+ if (sscanf(fields[QUE_UID], "%04x", &uid) == 1)
+ work = bflsc_work_by_uid(bflsc, sc_info, uid);
+ /* FIXME: Read the QUE_CC field and store stats per cortex */
+ } else {
+ char midstate[MIDSTATE_BYTES] = {}, blockdata[MERKLE_BYTES] = {};
+
+ if (!hex2bin((unsigned char *)midstate, fields[QUE_MIDSTATE], MIDSTATE_BYTES) ||
+ !hex2bin((unsigned char *)blockdata, fields[QUE_BLOCKDATA], MERKLE_BYTES)) {
+ applog(LOG_INFO, "%s%i:%s Failed to convert binary data to hex result - ignored",
+ bflsc->drv->name, bflsc->device_id, xlink);
+ inc_bflsc_errors(thr, sc_info, core);
+ return;
+ }
- work = take_queued_work_bymidstate(bflsc, midstate, MIDSTATE_BYTES,
- blockdata, MERKLE_OFFSET, MERKLE_BYTES);
+ work = take_queued_work_bymidstate(bflsc, midstate, MIDSTATE_BYTES,
+ blockdata, MERKLE_OFFSET, MERKLE_BYTES);
+ }
if (!work) {
if (sc_info->not_first_work) {
applog(LOG_INFO, "%s%i:%s failed to find nonce work - can't be processed - ignored",
diff --git a/driver-bflsc.h b/driver-bflsc.h
index f1b4105..d7e006c 100644
--- a/driver-bflsc.h
+++ b/driver-bflsc.h
@@ -183,6 +183,9 @@ struct QueueJobStructure {
#define QUE_MIDSTATE 0
#define QUE_BLOCKDATA 1
+#define QUE_UID 0
+#define QUE_CC 1
+
#define QUE_NONCECOUNT_V1 2
#define QUE_FLD_MIN_V1 3
#define QUE_FLD_MAX_V1 (QUE_MAX_RESULTS+QUE_FLD_MIN_V1)