GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-06 12:04:20 +00:00
Code Issues Releases Wiki Activity

Limit USB transfers to the max size reported by the descriptors.

Browse Source
This commit is contained in:
Con Kolivas 2013-06-19 13:18:15 +10:00
parent a81749bb38
commit f4d74116d3
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usbutils.c
View File

@ -305,7 +305,7 @@ static struct usb_find_devices find_dev[] = {
.epcount = 0, .epcount = 0,
.eps = NULL }, .eps = NULL },
#endif #endif
{ DRV_LAST, NULL, 0, 0, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL } { DRV_LAST, NULL, 0, 0, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL }
}; };
#ifdef USE_BFLSC #ifdef USE_BFLSC
@ -1647,6 +1647,7 @@ static int _usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct u
&& epdesc->wMaxPacketSize >= found->eps[k].size && epdesc->wMaxPacketSize >= found->eps[k].size
&& epdesc->bEndpointAddress == found->eps[k].ep) { && epdesc->bEndpointAddress == found->eps[k].ep) {
found->eps[k].found = true; found->eps[k].found = true;
found->wMaxPacketSize = epdesc->wMaxPacketSize;
break; break;
} }
} }
@ -2183,6 +2184,11 @@ usb_bulk_transfer(struct libusb_device_handle *dev_handle,
{ {
int err, tries = 0; int err, tries = 0;
/* Limit length of transfer to the largest this descriptor supports
* and leave the higher level functions to transfer more if needed. */
if (length > cgpu->usbdev->found->wMaxPacketSize)
length = cgpu->usbdev->found->wMaxPacketSize;
cg_rlock(&cgusb_fd_lock); cg_rlock(&cgusb_fd_lock);
err = libusb_bulk_transfer(dev_handle, endpoint, data, length, err = libusb_bulk_transfer(dev_handle, endpoint, data, length,
transferred, timeout); transferred, timeout);

1
usbutils.h
View File

@ -142,6 +142,7 @@ struct usb_find_devices {
int config; int config;
int interface; int interface;
unsigned int timeout; unsigned int timeout;
uint16_t wMaxPacketSize;
uint16_t latency; uint16_t latency;
int epcount; int epcount;
struct usb_endpoints *eps; struct usb_endpoints *eps;