Merge remote-tracking branch 'libusb/master'

Author: KritzelKratzel

AUTHORS

@@ -15,6 +15,7 @@ Aaron Luft
 Adam Korcz
 Addison Crump
 Adrian Bunk
+Adrien Bertrand
 Adrien Destugues
 Akshay Jaggi
 Alan Ott
@@ -84,8 +85,10 @@ Graeme Gill
 Greg Kroah-Hartman
 Gustavo Zacarias
 Haidong Zheng
+Hannes Franke
 Hans Ulrich Niedermann
 Harry Mallon
+Hartwig Wiesmann
 Hector Martin
 Hoi-Ho Chan
 Ido Yariv
@@ -124,9 +127,11 @@ Lars Wirzenius
 Lei Chen
 Léo Lam
 Liang Yunwang
+Logan Gallois
 Lonnie Abelbeck
 Luca Longinotti
 Luz Paz
+Łukasz Bartosik
 Mac Wang
 Marco Trevisan (Treviño)
 Marcus Meissner
@@ -138,6 +143,7 @@ Martin Koegler
 Martin Ling
 Martin Thierer
 Mathias Hjärtström
+Matt Liberty
 Matthew Stapleton
 Matthias Bolte
 Matthijs Lavrijsen
@@ -152,6 +158,7 @@ Nancy Li
 Nia Alarie
 Nicholas Corgan
 Niklas Gürtler
+Ole André Vadla Ravnås
 Oleksand Radovenchyk
 Omri Iluz
 Orhan aib Kavrakoglu
@@ -191,6 +198,7 @@ Steinar H. Gunderson
 Stephen Groat
 Sylvain Fasel
 Theo Buehler
+Theodor Engøy
 Thomas Röfer
 Tim Hutt
 Tim Roberts
@@ -200,6 +208,7 @@ Tormod Volden
 Trygve Laugstøl
 Uri Lublin
 Uwe Bonnes
+Vadim Mikhailov
 Vasily Khoruzhick
 Vegard Storheil Eriksen
 Venkatesh Shukla
@@ -208,6 +217,7 @@ Victor Toso
 Vinicius Tinti
 Vitali Lovich
 Vladimir Beloborodov
+Vladimir Gladkov
 William Orr
 William Skellenger
 Xiaofan Chen

ChangeLog

@@ -1,6 +1,6 @@
 For detailed information about the changes below, please see the git log.
 
-202?-??-??: v1.0.30
+2026-02-22: v1.0.30-rc1
 * Add hotplug support on Microsoft Windows
 * Add RAW_IO support in WinUSB backend
 * Work around a macOS 26 Tahoe compatibility breakage due to Apple changing kUSBHostPortPropertyPortNumber

libusb/libusb-1.0.def

@@ -25,7 +25,9 @@ EXPORTS
   libusb_dev_mem_free
   libusb_dev_mem_free@12 = libusb_dev_mem_free
   libusb_endpoint_set_raw_io
+  libusb_endpoint_set_raw_io@12 = libusb_endpoint_set_raw_io
   libusb_endpoint_supports_raw_io
+  libusb_endpoint_supports_raw_io@8 = libusb_endpoint_supports_raw_io
   libusb_error_name
   libusb_error_name@4 = libusb_error_name
   libusb_event_handler_active
@@ -66,8 +68,6 @@ EXPORTS
   libusb_get_active_interface_association_descriptors@8 = libusb_get_active_interface_association_descriptors
   libusb_get_bos_descriptor
   libusb_get_bos_descriptor@8 = libusb_get_bos_descriptor
-  libusb_get_session_data
-  libusb_get_session_data@4 = libusb_get_session_data
   libusb_get_bus_number
   libusb_get_bus_number@4 = libusb_get_bus_number
   libusb_get_config_descriptor
@@ -96,9 +96,10 @@ EXPORTS
   libusb_get_max_alt_packet_size@16 = libusb_get_max_alt_packet_size
   libusb_get_max_iso_packet_size
   libusb_get_max_iso_packet_size@8 = libusb_get_max_iso_packet_size
-  libusb_get_max_raw_io_transfer_size
   libusb_get_max_packet_size
   libusb_get_max_packet_size@8 = libusb_get_max_packet_size
+  libusb_get_max_raw_io_transfer_size
+  libusb_get_max_raw_io_transfer_size@8 = libusb_get_max_raw_io_transfer_size
   libusb_get_next_timeout
   libusb_get_next_timeout@8 = libusb_get_next_timeout
   libusb_get_parent
@@ -113,6 +114,8 @@ EXPORTS
   libusb_get_port_numbers@12 = libusb_get_port_numbers
   libusb_get_port_path
   libusb_get_port_path@16 = libusb_get_port_path
+  libusb_get_session_data
+  libusb_get_session_data@4 = libusb_get_session_data
   libusb_get_ss_endpoint_companion_descriptor
   libusb_get_ss_endpoint_companion_descriptor@12 = libusb_get_ss_endpoint_companion_descriptor
   libusb_get_ss_usb_device_capability_descriptor

libusb/os/darwin_usb.c

@@ -1027,9 +1027,9 @@ static int get_configuration_index (struct libusb_device *dev, UInt8 config_valu
     return darwin_to_libusb (kresult);
 
   for (i = 0 ; i < numConfig ; i++) {
-    (*priv->device)->GetConfigurationDescriptorPtr (priv->device, i, &desc);
+    kresult = (*priv->device)->GetConfigurationDescriptorPtr (priv->device, i, &desc);
 
-    if (desc->bConfigurationValue == config_value)
+    if (kresult == kIOReturnSuccess && desc->bConfigurationValue == config_value)
       return i;
   }
 
@@ -2160,7 +2160,11 @@ static int darwin_reenumerate_device (struct libusb_device_handle *dev_handle, b
   cached_configurations = alloca (sizeof (*cached_configurations) * descriptor.bNumConfigurations);
 
   for (i = 0 ; i < descriptor.bNumConfigurations ; ++i) {
-    (*dpriv->device)->GetConfigurationDescriptorPtr (dpriv->device, i, &cached_configuration);
+    kresult = (*dpriv->device)->GetConfigurationDescriptorPtr (dpriv->device, i, &cached_configuration);
+    if (kresult != kIOReturnSuccess) {
+      dpriv->in_reenumerate = false;
+      return LIBUSB_ERROR_NOT_FOUND;
+    }
     memcpy (cached_configurations + i, cached_configuration, sizeof (cached_configurations[i]));
   }
 
@@ -2222,8 +2226,8 @@ static int darwin_reenumerate_device (struct libusb_device_handle *dev_handle, b
   }
 
   for (i = 0 ; i < descriptor.bNumConfigurations ; ++i) {
-    (void) (*dpriv->device)->GetConfigurationDescriptorPtr (dpriv->device, i, &cached_configuration);
-    if (memcmp (cached_configuration, cached_configurations + i, sizeof (cached_configurations[i])) != 0) {
+    kresult = (*dpriv->device)->GetConfigurationDescriptorPtr (dpriv->device, i, &cached_configuration);
+    if (kresult != kIOReturnSuccess || memcmp (cached_configuration, cached_configurations + i, sizeof (cached_configurations[i])) != 0) {
       usbi_dbg (ctx, "darwin/reenumerate_device: configuration descriptor %d changed", i);
       return LIBUSB_ERROR_NOT_FOUND;
     }

libusb/os/linux_usbfs.c

@@ -301,16 +301,7 @@ static const char *find_usbfs_path(void)
 		}
 	}
 
-/* On udev based systems without any usb-devices /dev/bus/usb will not
- * exist. So if we've not found anything and we're using udev for hotplug
- * simply assume /dev/bus/usb rather then making libusb_init fail.
- * Make the same assumption for Android where SELinux policies might block us
- * from reading /dev on newer devices. */
-#if defined(HAVE_LIBUDEV) || defined(__ANDROID__)
-	return USB_DEVTMPFS_PATH;
-#else
 	return NULL;
-#endif
 }
 
 static int get_kernel_version(struct libusb_context *ctx,
@@ -378,12 +369,16 @@ static int op_init(struct libusb_context *ctx)
 
 	usbfs_path = find_usbfs_path();
 	if (!usbfs_path) {
-		usbi_err(ctx, "could not find usbfs");
-		return LIBUSB_ERROR_OTHER;
+		/* On udev based systems without any usb devices /dev/bus/usb will not
+		* exist. On android and other systems SELinux policies might block us
+		* from reading /dev. Nonetheless it's the default for most modern linux
+		systems including those using udev alternatives such as busybox's mdev. */
+		usbfs_path = USB_DEVTMPFS_PATH;
+		usbi_dbg(ctx, "could not find usbfs, defaulting to %s", usbfs_path);
+	} else {
+		usbi_dbg(ctx, "found usbfs at %s", usbfs_path);
 	}
 
-	usbi_dbg(ctx, "found usbfs at %s", usbfs_path);
-
 	if (!max_iso_packet_len) {
 		if (kernel_version_ge(&kversion, 5, 2, 0))
 			max_iso_packet_len = 98304;
@@ -1302,6 +1297,10 @@ static int usbfs_get_device_list(struct libusb_context *ctx)
 		buses = opendir(USB_DEVTMPFS_PATH);
 
 	if (!buses) {
+		if (!usbdev_names && errno == ENOENT) {
+			/* The path does not exist if there are no devices plugged in */
+			return LIBUSB_SUCCESS;
+		}
 		usbi_err(ctx, "opendir buses failed, errno=%d", errno);
 		return LIBUSB_ERROR_IO;
 	}
@@ -1379,10 +1378,10 @@ static int linux_default_scan_devices(struct libusb_context *ctx)
 	 * any autosuspended USB devices. however, sysfs is not available
 	 * everywhere, so we need a usbfs fallback too.
 	 */
-	if (sysfs_available)
-		return sysfs_get_device_list(ctx);
-	else
-		return usbfs_get_device_list(ctx);
+	if (sysfs_available && sysfs_get_device_list(ctx) == LIBUSB_SUCCESS)
+		return LIBUSB_SUCCESS;
+
+    return usbfs_get_device_list(ctx);
 }
 #endif
 

libusb/os/windows_winusb.c

@@ -1988,19 +1988,14 @@ static int winusb_get_device_list(struct libusb_context *ctx, struct discovered_
 				break;
 			case GEN_PASS:
 				port_nr = 0;
-#if defined(LIBUSB_WINDOWS_HOTPLUG)
 				if (priv->initialized) {
 					libusb_unref_device(parent_dev);
 					r = LIBUSB_SUCCESS;
-				}
-				else {
-#endif
+				} else {
 					if (!get_dev_port_number(*dev_info, &dev_info_data, &port_nr))
 						usbi_warn(ctx, "could not retrieve port number for device '%s': %s", dev_id, windows_error_str(0));
 					r = init_device(dev, parent_dev, (uint8_t)port_nr, dev_info_data.DevInst);
-#if defined(LIBUSB_WINDOWS_HOTPLUG)
 				}
-#endif
 				if (r == LIBUSB_SUCCESS) {
 					// Append device to the list of discovered devices
 					if (_discdevs) {

libusb/version.h

@@ -7,12 +7,12 @@
 #define LIBUSB_MINOR 0
 #endif
 #ifndef LIBUSB_MICRO
-#define LIBUSB_MICRO 29
+#define LIBUSB_MICRO 30
 #endif
 #ifndef LIBUSB_NANO
 #define LIBUSB_NANO 0
 #endif
 /* LIBUSB_RC is the release candidate suffix. Should normally be empty. */
 #ifndef LIBUSB_RC
-#define LIBUSB_RC ""
+#define LIBUSB_RC "-rc1"
 #endif

libusb/version_nano.h

@@ -1 +1 @@
-#define LIBUSB_NANO 12002
+#define LIBUSB_NANO 12008