Merge leap-2.2.x into our master branch

android/jni/examples.mk

@@ -28,9 +28,9 @@ LOCAL_SRC_FILES := \
   $(LIBUSB_ROOT_REL)/examples/listdevs.c
 
 LOCAL_C_INCLUDES += \
-  $(LIBUSB_ROOT_ABS)
+  $(LIBUSB_ROOT_ABS)/libusb
 
-LOCAL_SHARED_LIBRARIES += libusb1.0
+LOCAL_SHARED_LIBRARIES += libusb-1.0.0
 
 LOCAL_MODULE:= listdevs
 
@@ -44,9 +44,9 @@ LOCAL_SRC_FILES := \
   $(LIBUSB_ROOT_REL)/examples/xusb.c
 
 LOCAL_C_INCLUDES += \
-  $(LIBUSB_ROOT_ABS)
+  $(LIBUSB_ROOT_ABS)/libusb
 
-LOCAL_SHARED_LIBRARIES += libusb1.0
+LOCAL_SHARED_LIBRARIES += libusb-1.0.0
 
 LOCAL_MODULE:= xusb
 
@@ -60,9 +60,9 @@ LOCAL_SRC_FILES := \
   $(LIBUSB_ROOT_REL)/examples/hotplugtest.c
 
 LOCAL_C_INCLUDES += \
-  $(LIBUSB_ROOT_ABS)
+  $(LIBUSB_ROOT_ABS)/libusb
 
-LOCAL_SHARED_LIBRARIES += libusb1.0
+LOCAL_SHARED_LIBRARIES += libusb-1.0.0
 
 LOCAL_MODULE:= hotplugtest
 
@@ -77,9 +77,9 @@ LOCAL_SRC_FILES := \
   $(LIBUSB_ROOT_REL)/examples/ezusb.c
 
 LOCAL_C_INCLUDES += \
-  $(LIBUSB_ROOT_ABS)
+  $(LIBUSB_ROOT_ABS)/libusb
 
-LOCAL_SHARED_LIBRARIES += libusb1.0
+LOCAL_SHARED_LIBRARIES += libusb-1.0.0
 
 LOCAL_MODULE:= fxload
 
@@ -93,9 +93,9 @@ LOCAL_SRC_FILES := \
   $(LIBUSB_ROOT_REL)/examples/sam3u_benchmark.c
 
 LOCAL_C_INCLUDES += \
-  $(LIBUSB_ROOT_ABS)
+  $(LIBUSB_ROOT_ABS)/libusb
 
-LOCAL_SHARED_LIBRARIES += libusb1.0
+LOCAL_SHARED_LIBRARIES += libusb-1.0.0
 
 LOCAL_MODULE:= sam3u_benchmark
 
@@ -109,9 +109,9 @@ LOCAL_SRC_FILES := \
   $(LIBUSB_ROOT_REL)/examples/dpfp.c
 
 LOCAL_C_INCLUDES += \
-  $(LIBUSB_ROOT_ABS)
+  $(LIBUSB_ROOT_ABS)/libusb
 
-LOCAL_SHARED_LIBRARIES += libusb1.0
+LOCAL_SHARED_LIBRARIES += libusb-1.0.0
 
 LOCAL_MODULE:= dpfp
 
@@ -125,9 +125,9 @@ LOCAL_SRC_FILES := \
   $(LIBUSB_ROOT_REL)/examples/dpfp_threaded.c
 
 LOCAL_C_INCLUDES += \
-  $(LIBUSB_ROOT_ABS)
+  $(LIBUSB_ROOT_ABS)/libusb
 
-LOCAL_SHARED_LIBRARIES += libusb1.0
+LOCAL_SHARED_LIBRARIES += libusb-1.0.0
 
 LOCAL_MODULE:= dpfp_threaded
 

android/jni/libusb.mk

@@ -49,6 +49,6 @@ LOCAL_EXPORT_C_INCLUDES := \
 
 LOCAL_LDLIBS := -llog
 
-LOCAL_MODULE := libusb1.0
+LOCAL_MODULE := libusb-1.0.0
 
 include $(BUILD_SHARED_LIBRARY)

android/jni/tests.mk

@@ -48,7 +48,7 @@ LOCAL_SRC_FILES := \
 LOCAL_C_INCLUDES += \
   $(LIBUSB_ROOT_ABS)
 
-LOCAL_SHARED_LIBRARIES += libusb1.0
+LOCAL_SHARED_LIBRARIES += libusb-1.0.0
 LOCAL_STATIC_LIBRARIES += testlib
 
 LOCAL_MODULE:= stress

libusb/core.c

@@ -832,6 +832,10 @@ ssize_t API_EXPORTED libusb_get_device_list(libusb_context *ctx,
 		usbi_mutex_unlock(&ctx->usb_devs_lock);
 	} else {
 		/* backend does not provide hotplug support */
+		if (!usbi_backend.get_device_list) {
+	          len = -1;
+		  goto out;
+		}
 		r = usbi_backend.get_device_list(ctx, &discdevs);
 	}
 
@@ -1276,6 +1280,74 @@ int API_EXPORTED libusb_open(libusb_device *dev,
 }
 
 /** \ingroup libusb_dev
+ * Open a device with a file descriptor and obtain a device handle.
+ * A handle allows you to perform I/O on the device in question.
+ *
+ * UseCase: Android, after permission granted from Android Device Manager.
+ * The fd can be obtained by calling UsbDeviceConnection.getFileDescriptor().
+ *
+ * Internally, this function adds a reference to the device and makes it
+ * available to you through libusb_get_device(). This reference is removed
+ * during libusb_close().
+ *
+ * This is a non-blocking function; no requests are sent over the bus.
+ *
+ * \param dev the device to open
+ * \param fd the file descriptor for the device
+ * \param handle output location for the returned device handle pointer. Only
+ * populated when the return code is 0.
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NO_MEM on memory allocation failure
+ * \returns LIBUSB_ERROR_ACCESS if the user has insufficient permissions
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns another LIBUSB_ERROR code on other failure
+ */
+int API_EXPORTED libusb_open2(libusb_device *dev, int fd,
+	libusb_device_handle **handle)
+{
+	if (usbi_backend.open2 == NULL) {
+		return LIBUSB_ERROR_NOT_SUPPORTED;
+	}
+
+	struct libusb_context *ctx = DEVICE_CTX(dev);
+	struct libusb_device_handle *_handle;
+	size_t priv_size = usbi_backend.device_handle_priv_size;
+	int r;
+	usbi_dbg("open %d.%d", dev->bus_number, dev->device_address);
+
+	_handle = malloc(sizeof(*_handle) + priv_size);
+	if (!_handle)
+		return LIBUSB_ERROR_NO_MEM;
+
+	r = usbi_mutex_init(&_handle->lock);
+	if (r) {
+		free(_handle);
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	_handle->dev = libusb_ref_device(dev);
+	_handle->auto_detach_kernel_driver = 0;
+	_handle->claimed_interfaces = 0;
+	memset(&_handle->os_priv, 0, priv_size);
+
+	r = usbi_backend.open2(_handle, fd);
+	if (r < 0) {
+		usbi_dbg("open2 %d.%d returns %d", dev->bus_number, dev->device_address, r);
+		libusb_unref_device(dev);
+		usbi_mutex_destroy(&_handle->lock);
+		free(_handle);
+		return r;
+	}
+
+	usbi_mutex_lock(&ctx->open_devs_lock);
+	list_add(&_handle->list, &ctx->open_devs);
+	usbi_mutex_unlock(&ctx->open_devs_lock);
+	*handle = _handle;
+
+	return 0;
+}
+
+/** \ingroup dev
  * Convenience function for finding a device with a particular
  * <tt>idVendor</tt>/<tt>idProduct</tt> combination. This function is intended
  * for those scenarios where you are using libusb to knock up a quick test
@@ -1459,6 +1531,27 @@ libusb_device * LIBUSB_CALL libusb_get_device(libusb_device_handle *dev_handle)
 }
 
 /** \ingroup libusb_dev
+ * Get the underlying device for a dev_node.
+ * UseCase: Android
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param dev_node device path
+ * \param descriptors the raw USB descriptors for the device
+ * \param descriptors_size the size of the descriptors array
+ * \returns the underlying device
+ */
+DEFAULT_VISIBILITY
+libusb_device * LIBUSB_CALL libusb_get_device2(libusb_context *ctx, const char *dev_node,
+	const char* descriptors, size_t descriptors_size)
+{
+	if (usbi_backend.get_device2 == NULL) {
+		/* Not supported on this platform */
+		return NULL;
+	}
+
+	return usbi_backend.get_device2(ctx, dev_node, descriptors, descriptors_size);
+}
+
+/** \ingroup dev
  * Determine the bConfigurationValue of the currently active configuration.
  *
  * You could formulate your own control request to obtain this information,
@@ -2306,7 +2399,11 @@ int API_EXPORTED libusb_has_capability(uint32_t capability)
 	case LIBUSB_CAP_HAS_CAPABILITY:
 		return 1;
 	case LIBUSB_CAP_HAS_HOTPLUG:
+#ifdef __ANDROID__
+		return 0;
+#else
 		return !(usbi_backend.get_device_list);
+#endif
 	case LIBUSB_CAP_HAS_HID_ACCESS:
 		return (usbi_backend.caps & USBI_CAP_HAS_HID_ACCESS);
 	case LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER:

libusb/libusb.h

@@ -1363,8 +1363,11 @@ int LIBUSB_CALL libusb_get_max_iso_packet_size(libusb_device *dev,
 	unsigned char endpoint);
 
 int LIBUSB_CALL libusb_open(libusb_device *dev, libusb_device_handle **dev_handle);
+int LIBUSB_CALL libusb_open2(libusb_device *dev, int fd, libusb_device_handle **handle);
 void LIBUSB_CALL libusb_close(libusb_device_handle *dev_handle);
 libusb_device * LIBUSB_CALL libusb_get_device(libusb_device_handle *dev_handle);
+libusb_device * LIBUSB_CALL libusb_get_device2(libusb_context *ctx, const char *dev_node,
+	const char* descriptors, size_t descriptors_len);
 
 int LIBUSB_CALL libusb_set_configuration(libusb_device_handle *dev_handle,
 	int configuration);

libusb/libusbi.h

@@ -148,9 +148,11 @@ static inline void list_add_tail(struct list_head *entry,
 
 static inline void list_del(struct list_head *entry)
 {
-	entry->next->prev = entry->prev;
-	entry->prev->next = entry->next;
-	entry->next = entry->prev = NULL;
+	if (entry->next && entry->prev) {
+		entry->next->prev = entry->prev;
+		entry->prev->next = entry->next;
+		entry->next = entry->prev = NULL;
+	}
 }
 
 static inline void list_cut(struct list_head *list, struct list_head *head)
@@ -701,6 +703,9 @@ struct usbi_os_backend {
 	 */
 	void (*hotplug_poll)(void);
 
+	struct libusb_device* (*get_device2)(struct libusb_context *ctx, const char *dev_node,
+		const char* descriptors, size_t descriptors_len);
+
 	/* Open a device for I/O and other USB operations. The device handle
 	 * is preallocated for you, you can retrieve the device in question
 	 * through handle->dev.
@@ -728,6 +733,8 @@ struct usbi_os_backend {
 	 */
 	int (*open)(struct libusb_device_handle *dev_handle);
 
+	int (*open2)(struct libusb_device_handle *handle, int fd);
+
 	/* Close a device such that the handle cannot be used again. Your backend
 	 * should destroy any resources that were allocated in the open path.
 	 * This may also be a good place to call usbi_remove_pollfd() to inform

libusb/os/darwin_usb.c

@@ -743,7 +743,7 @@ static int darwin_request_descriptor (usb_device_t **device, UInt8 desc, UInt8 d
 
 static int darwin_cache_device_descriptor (struct libusb_context *ctx, struct darwin_cached_device *dev) {
   usb_device_t **device = dev->device;
-  int retries = 1, delay = 30000;
+  int retries = 2, delay = 30000;
   int unsuspended = 0, try_unsuspend = 1, try_reconfigure = 1;
   int is_open = 0;
   int ret = 0, ret2;
@@ -756,11 +756,6 @@ static int darwin_cache_device_descriptor (struct libusb_context *ctx, struct da
   (*device)->GetDeviceProduct (device, &idProduct);
   (*device)->GetDeviceVendor (device, &idVendor);
 
-  /* According to Apple's documentation the device must be open for DeviceRequest but we may not be able to open some
-   * devices and Apple's USB Prober doesn't bother to open the device before issuing a descriptor request.  Still,
-   * to follow the spec as closely as possible, try opening the device */
-  is_open = ((*device)->USBDeviceOpenSeize(device) == kIOReturnSuccess);
-
   do {
     /**** retrieve device descriptor ****/
     ret = darwin_request_descriptor (device, kUSBDeviceDesc, 0, &dev->dev_descriptor, sizeof(dev->dev_descriptor));
@@ -790,6 +785,13 @@ static int darwin_cache_device_descriptor (struct libusb_context *ctx, struct da
       ret = kIOUSBPipeStalled;
     }
 
+    if (kIOReturnSuccess != ret && !is_open) {
+      /* if the device descriptor request failed on the unopened device, try again with the device opened */
+      is_open = ((*device)->USBDeviceOpenSeize(device) == kIOReturnSuccess);
+      if (is_open)
+        continue;
+    }
+
     if (kIOReturnSuccess != ret && is_open && try_unsuspend) {
       /* device may be suspended. unsuspend it and try again */
 #if DeviceVersion >= 320
@@ -1618,7 +1620,7 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer) {
     return darwin_to_libusb (ret);
   }
 
-  if (0 != (transfer->length % maxPacketSize)) {
+  if (0 != maxPacketSize && 0 != (transfer->length % maxPacketSize)) {
     /* do not need a zero packet */
     transfer->flags &= ~LIBUSB_TRANSFER_ADD_ZERO_PACKET;
   }

libusb/os/darwin_usb.h

@@ -27,6 +27,9 @@
 #include <IOKit/usb/IOUSBLib.h>
 #include <IOKit/IOCFPlugIn.h>
 
+/* Include support for Mac OS X 10.6 */
+#undef kIOUSBDeviceInterfaceID500
+
 /* IOUSBInterfaceInferface */
 
 /* New in OS 10.12.0. */