aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Petter Selasky <hselasky@FreeBSD.org>2016-06-29 10:47:44 +0000
committerHans Petter Selasky <hselasky@FreeBSD.org>2016-06-29 10:47:44 +0000
commitde6e36c8d6967cb02d18f1d3e73fa82e87bcd6a8 (patch)
tree8e7743d14ea7a6ff0b2c9a5905019294c8d40403
parent357c8ca7388f2fd0df3580131dd37460a10e2517 (diff)
downloadsrc-de6e36c8d6967cb02d18f1d3e73fa82e87bcd6a8.tar.gz
src-de6e36c8d6967cb02d18f1d3e73fa82e87bcd6a8.zip
MFC r301842:
Implement code to stop all USB endpoints before executing a USB device reset command, alternate setting command or set configuration command. Else LibUSB v1.0 will not re-open the endpoints which the kernel closes and the USB application might wait infinitely for transfers to complete.
Notes
Notes: svn path=/stable/8/; revision=302274
-rw-r--r--lib/libusb/libusb10.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c
index 856eafa1aeb9..7979f9bb7336 100644
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
@@ -45,6 +45,8 @@
#include "libusb.h"
#include "libusb10.h"
+#define LIBUSB_NUM_SW_ENDPOINTS (16 * 4)
+
static pthread_mutex_t default_context_lock = PTHREAD_MUTEX_INITIALIZER;
struct libusb_context *usbi_default_context = NULL;
@@ -423,7 +425,7 @@ libusb_open(libusb_device *dev, libusb_device_handle **devh)
if (dev == NULL)
return (LIBUSB_ERROR_INVALID_PARAM);
- err = libusb20_dev_open(pdev, 16 * 4 /* number of endpoints */ );
+ err = libusb20_dev_open(pdev, LIBUSB_NUM_SW_ENDPOINTS);
if (err) {
libusb_unref_device(dev);
return (LIBUSB_ERROR_NO_MEM);
@@ -1476,7 +1478,17 @@ libusb_cancel_transfer(struct libusb_transfer *uxfer)
UNEXPORTED void
libusb10_cancel_all_transfer(libusb_device *dev)
{
- /* TODO */
+ struct libusb20_device *pdev = dev->os_priv;
+ unsigned x;
+
+ for (x = 0; x != LIBUSB_NUM_SW_ENDPOINTS; x++) {
+ struct libusb20_transfer *xfer;
+
+ xfer = libusb20_tr_get_pointer(pdev, x);
+ if (xfer == NULL)
+ continue;
+ libusb20_tr_close(xfer);
+ }
}
uint16_t