Commit b73ab4881490283f52e7e36522813b472e57c492
2013-05-27T17:28:49
Do a simple usb_read_once for the avalon result from a reset command.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80
diff --git a/driver-avalon.c b/driver-avalon.c
index ce1cd9b..d0acfae 100644
--- a/driver-avalon.c
+++ b/driver-avalon.c
@@ -233,39 +233,6 @@ static bool avalon_decode_nonce(struct thr_info *thr, struct cgpu_info *avalon,
return submit_nonce(thr, work, nonce);
}
-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];
-
- avalon_wait_ready(avalon);
- 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;
- }
-
- 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
* status is updated every 40ms. */
static void wait_avalon_ready(struct cgpu_info *avalon)
@@ -278,9 +245,9 @@ static void wait_avalon_ready(struct cgpu_info *avalon)
static int avalon_reset(struct cgpu_info *avalon, bool initial)
{
struct avalon_result ar;
+ int ret, i, spare, err;
struct avalon_task at;
uint8_t *buf, *tmp;
- int ret, i, spare;
struct timespec p;
/* Send reset, then check for result */
@@ -303,8 +270,11 @@ static int avalon_reset(struct cgpu_info *avalon, bool initial)
return 0;
}
- ret = avalon_read(avalon, (char *)&ar, AVALON_READ_SIZE);
- if (unlikely(ret == AVA_GETS_ERROR))
+ err = usb_read_once(avalon, (char *)&ar, AVALON_READ_SIZE, &ret,
+ C_AVALON_READ);
+ applog(LOG_DEBUG, "%s%i: Get avalon read got err %d",
+ avalon->drv->name, avalon->device_id, err);
+ if (unlikely(err))
return -1;
/* What do these sleeps do?? */
@@ -314,8 +284,8 @@ static int avalon_reset(struct cgpu_info *avalon, bool initial)
/* Look for the first occurrence of 0xAA, the reset response should be:
* AA 55 AA 55 00 00 00 00 00 00 */
- spare = AVALON_READ_SIZE - 10;
- tmp = (uint8_t *)&ar;
+ spare = ret - 10;
+ buf = tmp = (uint8_t *)&ar;
if (opt_debug) {
applog(LOG_DEBUG, "AVA%d reset: get:", avalon->device_id);
hexdump(tmp, AVALON_READ_SIZE);