Commit ec09fd6b38e8c1dea6a98b5b9b65797e58409833
2013-11-11T21:22:47
We must chop up every 64 bytes returned on an ftdi chip, not just the first 2 bytes so revert to parsing the data internally in the avalon instead of using usbutils' simple ftdi parser.
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
diff --git a/driver-avalon.c b/driver-avalon.c
index 8a892d8..1372093 100644
--- a/driver-avalon.c
+++ b/driver-avalon.c
@@ -291,14 +291,29 @@ static inline bool avalon_cts(char c)
static int avalon_read(struct cgpu_info *avalon, char *buf, size_t bufsize, int ep)
{
- int err, amount;
+ size_t total = 0, readsize = bufsize + 2;
+ char readbuf[AVALON_READBUF_SIZE];
+ int err, amount, ofs = 2, cp;
- err = usb_read_once(avalon, buf, bufsize, &amount, ep);
+ err = usb_read_once(avalon, readbuf, readsize, &amount, ep);
applog(LOG_DEBUG, "%s%i: Get avalon read got err %d",
avalon->drv->name, avalon->device_id, err);
- if (unlikely(err && err != LIBUSB_ERROR_TIMEOUT))
- amount = -1;
- return amount;
+
+ if (amount < 2)
+ goto out;
+
+ /* The first 2 of every 64 bytes are status on FTDIRL */
+ while (amount > 2) {
+ cp = amount - 2;
+ if (cp > 62)
+ cp = 62;
+ memcpy(&buf[total], &readbuf[ofs], cp);
+ total += cp;
+ amount -= cp + 2;
+ ofs += 64;
+ }
+out:
+ return total;
}
static int avalon_reset(struct cgpu_info *avalon, bool initial)
@@ -761,7 +776,9 @@ static bool avalon_detect_one(libusb_device *dev, struct usb_find_devices *found
&asic_count, &timeout, &frequency,
(usb_ident(avalon) == IDENT_BBF && opt_bitburner_fury_options != NULL) ? opt_bitburner_fury_options : opt_avalon_options);
- avalon->usbdev->usb_type = USB_TYPE_FTDI;
+ /* Even though this is an FTDI type chip, we want to do the parsing
+ * all ourselves so set it to std usb type */
+ avalon->usbdev->usb_type = USB_TYPE_STD;
/* We have a real Avalon! */
avalon_initialise(avalon);