GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-14 16:58:05 +00:00
Code Issues Releases Wiki Activity

Demote failed hex2bin result to LOG_INFO and check return result in driver-bflsc to avoid doing find_work_by_midstate.

Browse Source
This commit is contained in:
Con Kolivas 2013-06-09 22:37:49 +10:00
parent 4f36d38c0f
commit 12a2cb0d3c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
driver-bflsc.c
View File

@ -1322,8 +1322,12 @@ static void process_nonces(struct cgpu_info *bflsc, int dev, char *xlink, char *
memset(midstate, 0, MIDSTATE_BYTES); memset(midstate, 0, MIDSTATE_BYTES);
memset(blockdata, 0, MERKLE_BYTES); memset(blockdata, 0, MERKLE_BYTES);
hex2bin((unsigned char *)midstate, fields[QUE_MIDSTATE], MIDSTATE_BYTES); if (!hex2bin((unsigned char *)midstate, fields[QUE_MIDSTATE], MIDSTATE_BYTES) ||
hex2bin((unsigned char *)blockdata, fields[QUE_BLOCKDATA], MERKLE_BYTES); !hex2bin((unsigned char *)blockdata, fields[QUE_BLOCKDATA], MERKLE_BYTES)) {
applog(LOG_ERR, "%s%i:%s Failed to convert binary data to hex result - ignored",
bflsc->drv->name, bflsc->device_id, xlink);
inc_hw_errors(bflsc->thr[0]);
}
work = find_queued_work_bymidstate(bflsc, midstate, MIDSTATE_BYTES, work = find_queued_work_bymidstate(bflsc, midstate, MIDSTATE_BYTES,
blockdata, MERKLE_OFFSET, MERKLE_BYTES); blockdata, MERKLE_OFFSET, MERKLE_BYTES);

2
util.c
View File

@ -615,7 +615,7 @@ bool hex2bin(unsigned char *p, const char *hexstr, size_t len)
hex_byte[1] = hexstr[1]; hex_byte[1] = hexstr[1];
if (unlikely(sscanf(hex_byte, "%x", &v) != 1)) { if (unlikely(sscanf(hex_byte, "%x", &v) != 1)) {
applog(LOG_ERR, "hex2bin sscanf '%s' failed", hex_byte); applog(LOG_INFO, "hex2bin sscanf '%s' failed", hex_byte);
return ret; return ret;
} }