Tryanks/gousb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'rawread_benchmark'

Browse Source
This commit is contained in:
Sebastian Zagrodzki
2017-02-09 22:52:55 +01:00
parent c792f8e028 66a1f45cd9
commit b4393ac372
3 changed files with 106 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
usb/constants.go
View File

@@ -87,7 +87,7 @@ func (dt DescriptorType) String() string {
type EndpointDirection uint8
const (
ENDPOINT_NUM_MASK = 0x03
ENDPOINT_NUM_MASK = 0x0f
ENDPOINT_DIR_IN EndpointDirection = C.LIBUSB_ENDPOINT_IN
ENDPOINT_DIR_OUT EndpointDirection = C.LIBUSB_ENDPOINT_OUT
ENDPOINT_DIR_MASK EndpointDirection = 0x80

10
usb/iso.c
View File

@@ -74,8 +74,8 @@ int extract_data(struct libusb_transfer *xfer, void *raw, int max, unsigned char
// Copy the data
int len = pkt.actual_length;
if (len > max) {
len = max;
if (copied + len > max) {
len = max - copied;
}
memcpy(out, in, len);
copied += len;
@@ -84,10 +84,14 @@ int extract_data(struct libusb_transfer *xfer, void *raw, int max, unsigned char
in += pkt.length;
out += len;
if (copied == max) {
break;
}
// Extract first error
if (pkt.status == 0 || *status != 0) {
continue;
}
}
*status = pkt.status;
}
return copied;