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

avalon_read should not loop but just return whatever it has succeeded in reading.

Browse Source
This commit is contained in:
Con Kolivas 2013-05-27 17:08:06 +10:00
parent 2c633fdbe4
commit 7ad8af19b9
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
driver-avalon.c
View File

@ -229,37 +229,33 @@ static bool avalon_decode_nonce(struct thr_info *thr, struct cgpu_info *avalon,
static int avalon_read(struct cgpu_info *avalon, char *buf, ssize_t len)
{
ssize_t aread = 0;
int amount, err, offset, cp;
char readbuf[AVALON_FTDI_READSIZE];
while (len > 0) {
int amount, err, offset, cp;
char readbuf[AVALON_FTDI_READSIZE];
err = usb_read_once_timeout(avalon, readbuf, AVALON_FTDI_READSIZE,
&amount, AVALON_READ_TIMEOUT,
C_AVALON_READ);
if (err && err != LIBUSB_ERROR_TIMEOUT) {
applog(LOG_WARNING, "%s%i: Get avalon read got err %d",
avalon->drv->name, avalon->device_id, err);
nmsleep(AVALON_READ_TIMEOUT);
continue;
}
if (amount < 3)
continue;
offset = 2;
do {
cp = amount - 2;
if (cp > 62)
cp = 62;
memcpy(&buf[aread], readbuf, cp);
aread += cp;
amount -= cp + 2;
offset += 64;
} while (amount > 2);
err = usb_read_once_timeout(avalon, readbuf, len, &amount,
AVALON_READ_TIMEOUT, C_AVALON_READ);
if (err && err != LIBUSB_ERROR_TIMEOUT) {
applog(LOG_WARNING, "%s%i: Get avalon read got err %d",
avalon->drv->name, avalon->device_id, err);
nmsleep(AVALON_READ_TIMEOUT);
return 0;
}
return AVA_GETS_OK;
if (amount < 3)
return 0;
offset = 2;
do {
cp = amount - 2;
if (cp > 62)
cp = 62;
memcpy(&buf[aread], readbuf, cp);
aread += cp;
amount -= cp + 2;
offset += 64;
} while (amount > 2);
return aread;
}
/* Wait until the ftdi chip returns a CTS saying we can send more data. The