summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIdo Yariv <ido@wizery.com>2020-06-16 23:22:31 -0400
committerNathan Hjelm <hjelmn@google.com>2020-06-16 22:58:46 -0600
commitad0473413edec14805e59599ff537eba0f5b8d33 (patch)
tree8361c5009121d01a089c29197a5f2cdde27ac866
parentbb3773090883409865a40e97a8cabb531fa00683 (diff)
downloadlibusb-ad0473413edec14805e59599ff537eba0f5b8d33.tar.gz
darwin: Fix invalid GetPipePropertiesV3 argument
GetPipePropertiesV3 seems to require that the bVersion field of the properties argument be set before calling it: "Version of the structure. Currently kUSBEndpointPropertiesVersion3. Need to set this when using this structure" Not doing so results in an invalid argument error. Closes #744 Signed-off-by: Ido Yariv <ido@wizery.com> Signed-off-by: Nathan Hjelm <hjelmn@google.com>
-rw-r--r--libusb/os/darwin_usb.c2
-rw-r--r--libusb/version_nano.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c
index b1e4514..a64d67d 100644
--- a/libusb/os/darwin_usb.c
+++ b/libusb/os/darwin_usb.c
@@ -1775,7 +1775,7 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer) {
struct darwin_interface *cInterface;
#if InterfaceVersion >= 550
- IOUSBEndpointProperties pipeProperties;
+ IOUSBEndpointProperties pipeProperties = {.bVersion = kUSBEndpointPropertiesVersion3};
#else
/* None of the values below are used in libusb for bulk transfers */
uint8_t direction, number, interval;
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index b8305e3..f1ac20f 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11521
+#define LIBUSB_NANO 11522