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

Use a separate avalon_get_reset function for resetting avalon instead of using avalon_get_result.

Browse Source
This commit is contained in:
Con Kolivas 2013-04-07 15:35:36 +10:00
parent ea70300a59
commit dec90b96ad
1 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
driver-avalon.c
View File

@ -261,13 +261,11 @@ static int avalon_get_result(int fd, struct avalon_result *ar,
struct cgpu_info *avalon; struct cgpu_info *avalon;
struct avalon_info *info; struct avalon_info *info;
uint8_t result[AVALON_READ_SIZE]; uint8_t result[AVALON_READ_SIZE];
int ret, read_count = AVALON_RESET_FAULT_DECISECONDS * AVALON_TIME_FACTOR; int ret, read_count;
if (likely(thr)) { avalon = thr->cgpu;
avalon = thr->cgpu; info = avalon_infos[avalon->device_id];
info = avalon_infos[avalon->device_id]; read_count = info->read_count;
read_count = info->read_count;
}
memset(result, 0, AVALON_READ_SIZE); memset(result, 0, AVALON_READ_SIZE);
ret = avalon_gets(fd, result, read_count, thr, tv_finish); ret = avalon_gets(fd, result, read_count, thr, tv_finish);
@ -307,6 +305,39 @@ static bool avalon_decode_nonce(struct thr_info *thr, struct avalon_result *ar,
return true; return true;
} }
static void avalon_get_reset(int fd, struct avalon_result *ar)
{
int read_amount = AVALON_READ_SIZE;
uint8_t result[AVALON_READ_SIZE];
struct timeval timeout = {1, 0};
ssize_t ret = 0;
fd_set rd;
memset(result, 0, AVALON_READ_SIZE);
memset(ar, 0, AVALON_READ_SIZE);
FD_ZERO(&rd);
FD_SET(fd, &rd);
ret = select(fd + 1, &rd, NULL, NULL, &timeout);
if (unlikely(ret < 0)) {
applog(LOG_WARNING, "Avalon: Error on select in avalon_get_reset");
return;
}
if (!ret) {
applog(LOG_WARNING, "Avalon: Timeout on select in avalon_get_reset");
return;
}
ret = read(fd, result, read_amount);
if (unlikely(ret != read_amount)) {
applog(LOG_WARNING, "Avalon: Error on read in avalon_get_reset");
return;
}
if (opt_debug) {
applog(LOG_DEBUG, "Avalon: get:");
hexdump((uint8_t *)result, AVALON_READ_SIZE);
}
memcpy((uint8_t *)ar, result, AVALON_READ_SIZE);
}
static int avalon_reset(int fd, struct avalon_result *ar) static int avalon_reset(int fd, struct avalon_result *ar)
{ {
struct avalon_task at; struct avalon_task at;
@ -325,7 +356,7 @@ static int avalon_reset(int fd, struct avalon_result *ar)
if (ret == AVA_SEND_ERROR) if (ret == AVA_SEND_ERROR)
return 1; return 1;
avalon_get_result(fd, ar, NULL, NULL); avalon_get_reset(fd, ar);
buf = (uint8_t *)ar; buf = (uint8_t *)ar;
/* Sometimes there is one extra 0 byte for some reason in the buffer, /* Sometimes there is one extra 0 byte for some reason in the buffer,