GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-22 20:44:19 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into avalon-dev

Browse Source
This commit is contained in:
Con Kolivas 2013-04-15 20:30:47 +10:00
commit f6284f7ca5
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
driver-avalon.c
View File

@ -929,17 +929,22 @@ static int64_t avalon_scanhash(struct thr_info *thr)
elapsed.tv_sec, elapsed.tv_usec);
}
}
if (unlikely(result_wrong >= avalon_get_work_count ||
(hash_count == 0 && ret != AVA_GETS_RESTART))) {
/* This means FPGA controller gave all wrong results, so
* try to reset the Avalon */
do_avalon_close(thr);
applog(LOG_ERR,
"AVA%i: FPGA controller mess up, %d wrong results", avalon->device_id, result_wrong);
dev_error(avalon, REASON_DEV_COMMS_ERROR);
sleep(1);
avalon_init(avalon);
return 0;
if (hash_count) {
if (avalon->results < AVALON_ARRAY_SIZE)
avalon->results++;
} else if (unlikely((result_wrong >= avalon_get_work_count ) ||
(ret != AVA_GETS_RESTART && --avalon->results < 0))) {
/* Look for all invalid results, or consecutive failure
* to generate any results suggesting the FPGA
* controller has screwed up. */
do_avalon_close(thr);
applog(LOG_ERR,
"AVA%i: FPGA controller messed up, %d wrong results",
avalon->device_id, result_wrong);
dev_error(avalon, REASON_DEV_COMMS_ERROR);
sleep(1);
avalon_init(avalon);
return 0;
}
avalon_rotate_array(avalon);

1
miner.h
View File

@ -431,6 +431,7 @@ struct cgpu_info {
struct work **works;
int work_array;
int queued;
int results;
#endif
#ifdef USE_USBUTILS
struct cg_usb_info usbinfo;