From 1471c6efa6791d7b957d27f6b8a13763806aeacf Mon Sep 17 00:00:00 2001 From: hselasky Date: Wed, 29 Jun 2016 10:47:44 +0000 Subject: [PATCH] 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. git-svn-id: svn://svn.freebsd.org/base/stable/8@302274 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- lib/libusb/libusb10.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c index 856eafa1a..7979f9bb7 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 -- 2.42.0