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

Use separate ep for avalon tasks vs avalon reset and do not loop in write indefinitely.

Browse Source
This commit is contained in:
Con Kolivas 2013-05-29 00:15:30 +10:00
parent 876e7e5893
commit d1337427fd
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
driver-avalon.c
View File

@ -121,23 +121,21 @@ static inline void avalon_create_task(struct avalon_task *at,
memcpy(at->data, work->data + 64, 12); memcpy(at->data, work->data + 64, 12);
} }
static int avalon_write(struct cgpu_info *avalon, char *buf, ssize_t len) static int avalon_write(struct cgpu_info *avalon, char *buf, ssize_t len, int ep)
{ {
ssize_t wrote = 0; int err, amount;
while (len > 0) { err = usb_write(avalon, buf, len, &amount, ep);
int amount, err; applog(LOG_DEBUG, "%s%i: usb_write got err %d", avalon->drv->name,
avalon->device_id, err);
err = usb_write(avalon, buf + wrote, len, &amount, C_AVALON_TASK);
applog(LOG_DEBUG, "%s%i: usb_write got err %d",
avalon->drv->name, avalon->device_id, err);
if (unlikely(err != 0)) { if (unlikely(err != 0)) {
applog(LOG_WARNING, "usb_write error on avalon_write"); applog(LOG_WARNING, "usb_write error on avalon_write");
return AVA_SEND_ERROR; return AVA_SEND_ERROR;
} }
wrote += amount; if (amount != len) {
len -= amount; applog(LOG_WARNING, "usb_write length mismatch on avalon_write");
return AVA_SEND_ERROR;
} }
return AVA_SEND_OK; return AVA_SEND_OK;
@ -152,7 +150,7 @@ static int avalon_send_task(const struct avalon_task *at, struct cgpu_info *aval
struct avalon_info *info; struct avalon_info *info;
uint64_t delay = 32000000; /* Default 32ms for B19200 */ uint64_t delay = 32000000; /* Default 32ms for B19200 */
uint32_t nonce_range; uint32_t nonce_range;
int ret, i; int ret, i, ep = C_AVALON_TASK;
if (at->nonce_elf) if (at->nonce_elf)
nr_len = AVALON_WRITE_SIZE + 4 * at->asic_num; nr_len = AVALON_WRITE_SIZE + 4 * at->asic_num;
@ -197,13 +195,15 @@ static int avalon_send_task(const struct avalon_task *at, struct cgpu_info *aval
delay = delay / info->baud; delay = delay / info->baud;
} }
if (at->reset) if (at->reset) {
ep = C_AVALON_RESET;
nr_len = 1; nr_len = 1;
}
if (opt_debug) { if (opt_debug) {
applog(LOG_DEBUG, "Avalon: Sent(%u):", (unsigned int)nr_len); applog(LOG_DEBUG, "Avalon: Sent(%u):", (unsigned int)nr_len);
hexdump(buf, nr_len); hexdump(buf, nr_len);
} }
ret = avalon_write(avalon, (char *)buf, nr_len); ret = avalon_write(avalon, (char *)buf, nr_len, ep);
p.tv_sec = 0; p.tv_sec = 0;
p.tv_nsec = (long)delay + 4000000; p.tv_nsec = (long)delay + 4000000;