Browse Source

Revert "Give a generous timeout whenever we expect an OK message for working bflsc communications."

This reverts commit 3d8cf60b96.
nfactor-troky
Con Kolivas 12 years ago
parent
commit
6fdc068f1b
  1. 9
      driver-bflsc.c

9
driver-bflsc.c

@ -497,8 +497,7 @@ static bool getok(struct cgpu_info *bflsc, enum usb_cmds cmd, int *err, int *amo @@ -497,8 +497,7 @@ static bool getok(struct cgpu_info *bflsc, enum usb_cmds cmd, int *err, int *amo
{
char buf[BFLSC_BUFSIZ+1];
*err = usb_read_ok_timeout(bflsc, buf, sizeof(buf)-1, amount,
BFLSC_INFO_TIMEOUT, cmd);
*err = usb_read_nl(bflsc, buf, sizeof(buf)-1, amount, cmd);
if (*err < 0 || *amount < (int)BFLSC_OK_LEN)
return false;
else
@ -507,8 +506,7 @@ static bool getok(struct cgpu_info *bflsc, enum usb_cmds cmd, int *err, int *amo @@ -507,8 +506,7 @@ static bool getok(struct cgpu_info *bflsc, enum usb_cmds cmd, int *err, int *amo
static bool getokerr(struct cgpu_info *bflsc, enum usb_cmds cmd, int *err, int *amount, char *buf, size_t bufsiz)
{
*err = usb_read_ok_timeout(bflsc, buf, bufsiz-1, amount,
BFLSC_INFO_TIMEOUT, cmd);
*err = usb_read_nl(bflsc, buf, bufsiz-1, amount, cmd);
if (*err < 0 || *amount < (int)BFLSC_OK_LEN)
return false;
else {
@ -562,8 +560,7 @@ static bool bflsc_qres(struct cgpu_info *bflsc, char *buf, size_t bufsiz, int de @@ -562,8 +560,7 @@ static bool bflsc_qres(struct cgpu_info *bflsc, char *buf, size_t bufsiz, int de
// of course all other I/O must also be failing ...
} else {
readok = true;
*err = usb_read_ok_timeout(bflsc, buf, bufsiz-1, amount,
BFLSC_INFO_TIMEOUT, C_GETRESULTS);
*err = usb_read_ok(bflsc, buf, bufsiz-1, amount, C_GETRESULTS);
mutex_unlock(&(bflsc->device_mutex));
if (*err < 0 || *amount < 1) {

Loading…
Cancel
Save