Update to v1.0.29 (latest master)

Merge commit 'c373a82858749858f64faddc08019524979a4d56'

Author: Youw

libusb/AUTHORS

@@ -152,6 +152,7 @@ Nancy Li
 Nia Alarie
 Nicholas Corgan
 Niklas Gürtler
+Oleksand Radovenchyk
 Omri Iluz
 Orhan aib Kavrakoglu
 Orin Eman

libusb/ChangeLog

@@ -1,6 +1,11 @@
 For detailed information about the changes below, please see the git log
 or visit: http://log.libusb.info
 
+2025-06-01: v1.0.29
+* Fix regression on macOS leading to timeouts in enumeration
+* LIBUSB_API_VERSION bump for the new functions in 1.0.28
+* Fix xusb regression displaying wrong error on claim failure
+
 2025-03-18: v1.0.28
 * New libusb_get_ssplus_usb_device_capability_descriptor API
   for query of SuperSpeed+ Capability Descriptors

libusb/README

@@ -1,9 +1,5 @@
 # libusb
 
-[![Build Status](https://travis-ci.org/libusb/libusb.svg?branch=master)](https://travis-ci.org/libusb/libusb)
-[![Build Status](https://ci.appveyor.com/api/projects/status/xvrfam94jii4a6lw?svg=true)](https://ci.appveyor.com/project/LudovicRousseau/libusb)
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/2180/badge.svg)](https://scan.coverity.com/projects/libusb-libusb)
-
 libusb is a library for USB device access from Linux, macOS,
 Windows, OpenBSD/NetBSD, Haiku, Solaris userspace, and WebAssembly
 via WebUSB.

libusb/examples/xusb.c

@@ -982,25 +982,23 @@ static int test_device(uint16_t vid, uint16_t pid)
 	libusb_set_auto_detach_kernel_driver(handle, 1);
 	for (iface = 0; iface < nb_ifaces; iface++)
 	{
-		int ret;
-
 		printf("\nKernel driver attached for interface %d: ", iface);
-		ret = libusb_kernel_driver_active(handle, iface);
-		if (ret == 0)
+		r = libusb_kernel_driver_active(handle, iface);
+		if (r == 0)
 			printf("none\n");
-		else if (ret == 1)
+		else if (r == 1)
 			printf("yes\n");
-		else if (ret == LIBUSB_ERROR_NOT_SUPPORTED)
+		else if (r == LIBUSB_ERROR_NOT_SUPPORTED)
 			printf("(not supported)\n");
 		else
-			perr("\n   Failed (error %d) %s\n", ret,
-			     libusb_strerror((enum libusb_error) ret));
+			perr("\n   Failed (error %d) %s\n", r,
+			     libusb_strerror((enum libusb_error) r));
 
 		printf("\nClaiming interface %d...\n", iface);
 		r = libusb_claim_interface(handle, iface);
 		if (r != LIBUSB_SUCCESS) {
-			perr("   Failed (error %d) %s\n", ret,
-			     libusb_strerror((enum libusb_error) ret));
+			perr("   Failed (error %d) %s\n", r,
+			     libusb_strerror((enum libusb_error) r));
 		}
 	}
 

libusb/libusb/core.c

@@ -92,7 +92,7 @@ struct list_head active_contexts_list;
  *
  * \section gettingstarted Getting Started
  *
- * To begin reading the API documentation, start with the Modules page which
+ * To begin reading the API documentation, start with the Topics page which
  * links to the different categories of libusb's functionality.
  *
  * One decision you will have to make is whether to use the synchronous

libusb/libusb/descriptor.c

@@ -1035,6 +1035,21 @@ struct internal_ssplus_capability_descriptor {
 };
 /// @endcond
 
+/** \ingroup libusb_desc
+ * Get a SuperSpeedPlus USB Device Capability descriptor
+ *
+ * Since version 1.0.28, \ref LIBUSB_API_VERSION >= 0x0100010B
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param dev_cap Device Capability descriptor with a bDevCapabilityType of
+ * \ref libusb_bos_type::LIBUSB_BT_SUPERSPEED_PLUS_CAPABILITY
+ * LIBUSB_BT_SUPERSPEED_PLUS_CAPABILITY
+ * \param ssplus_usb_device_cap output location for the SuperSpeedPlus USB Device
+ * Capability descriptor. Only valid if 0 was returned. Must be freed with
+ * libusb_free_ssplus_usb_device_capability_descriptor() after use.
+ * \returns 0 on success
+ * \returns a LIBUSB_ERROR code on error
+ */
 int API_EXPORTED libusb_get_ssplus_usb_device_capability_descriptor(
 	libusb_context *ctx,
 	struct libusb_bos_dev_capability_descriptor *dev_cap,
@@ -1102,6 +1117,17 @@ int API_EXPORTED libusb_get_ssplus_usb_device_capability_descriptor(
 	return LIBUSB_SUCCESS;
 }
 
+/** \ingroup libusb_desc
+ * Free a SuperSpeedPlus USB Device Capability descriptor obtained from
+ * libusb_get_ssplus_usb_device_capability_descriptor().
+ * It is safe to call this function with a NULL ssplus_usb_device_cap
+ * parameter, in which case the function simply returns.
+ *
+ * Since version 1.0.28, \ref LIBUSB_API_VERSION >= 0x0100010B
+ *
+ * \param ssplus_usb_device_cap the SuperSpeedPlus USB Device Capability descriptor
+ * to free
+ */
 void API_EXPORTED libusb_free_ssplus_usb_device_capability_descriptor(
 	struct libusb_ssplus_usb_device_capability_descriptor *ssplus_usb_device_cap)
 {

libusb/libusb/libusb.h

@@ -166,9 +166,11 @@ typedef SSIZE_T ssize_t;
  * <li>libusb version 1.0.25: LIBUSB_API_VERSION = 0x01000109
  * <li>libusb version 1.0.26: LIBUSB_API_VERSION = 0x01000109
  * <li>libusb version 1.0.27: LIBUSB_API_VERSION = 0x0100010A
+ * <li>libusb version 1.0.28: LIBUSB_API_VERSION = 0x0100010A
+ * <li>libusb version 1.0.29: LIBUSB_API_VERSION = 0x0100010B
  * </ul>
  */
-#define LIBUSB_API_VERSION 0x0100010A
+#define LIBUSB_API_VERSION 0x0100010B
 
 /** \def LIBUSBX_API_VERSION
  * \ingroup libusb_misc

libusb/libusb/os/darwin_usb.c

@@ -2131,12 +2131,11 @@ static int darwin_reenumerate_device (struct libusb_device_handle *dev_handle, b
     struct timespec delay = {.tv_sec = 0, .tv_nsec = 1000};
     nanosleep (&delay, NULL);
 
-    struct timespec now;
+    struct timespec now, delta;
     usbi_get_monotonic_time(&now);
-    long delta_sec = now.tv_sec - start.tv_sec;
-    long delta_nsec = now.tv_nsec - start.tv_nsec;
-    unsigned long long elapsed_us = (unsigned long long)delta_sec * USEC_PER_SEC +
-                                    (unsigned long long)delta_nsec / 1000ULL;
+    TIMESPEC_SUB(&now, &start, &delta);
+    unsigned long long elapsed_us = (unsigned long long)delta.tv_sec * USEC_PER_SEC +
+                                    (unsigned long long)delta.tv_nsec / 1000ULL;
 
     if (elapsed_us >= DARWIN_REENUMERATE_TIMEOUT_US) {
       usbi_err (ctx, "darwin/reenumerate_device: timeout waiting for reenumerate");

libusb/libusb/version.h

@@ -7,7 +7,7 @@
 #define LIBUSB_MINOR 0
 #endif
 #ifndef LIBUSB_MICRO
-#define LIBUSB_MICRO 28
+#define LIBUSB_MICRO 29
 #endif
 #ifndef LIBUSB_NANO
 #define LIBUSB_NANO 0

libusb/libusb/version_nano.h

@@ -1 +1 @@
-#define LIBUSB_NANO 11946
+#define LIBUSB_NANO 11953