usb 2.17.0 → 2.18.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [2.18.0] - 2026-06-06
+
+### Changed
+- Updated libusb to v1.0.30 - [`950`](https://github.com/node-usb/node-usb/pull/950) ([Rob Moran](https://github.com/thegecko))
+- Switched to using libusb hotplug support for Windows - [`953`](https://github.com/node-usb/node-usb/pull/953) ([Rob Moran](https://github.com/thegecko))
+
 ## [2.17.0] - 2026-01-18
 
 ### Changed

package/README.md

@@ -606,6 +606,20 @@ There is no direct equivalent to this. Instead you can listen to both `attach` a
 # Development
 The library is based on native bindings wrapping the [libusb](https://github.com/libusb/libusb) library.
 
+## Prerequisites
+
+A valid node-gyp build system
+
+### Windows
+
+- [chocolatey](https://chocolatey.org/)
+
+```bash
+choco install python visualstudio2019-workload-vctools -y
+```
+
+If the automatic installation of VS Tools fails or pauses, open the installer GUI to resume installation.
+
 ## Setup
 Libusb is included as a submodule, clone this repository and then the submodule as follows:
 

package/binding.gyp

@@ -29,7 +29,8 @@
         'src/node_usb.cc',
         'src/device.cc',
         'src/transfer.cc',
-        'src/thread_name.cc'
+        'src/thread_name.cc',
+        'src/hotplug.cc'
       ],
       'cflags_cc': [
         '-std=c++14'
@@ -76,15 +77,7 @@
               'MACOSX_DEPLOYMENT_TARGET': '10.7'
             }
           }],
-          ['OS!="win"', {
-            'sources': [
-              'src/hotplug/libusb.cc'
-            ],
-          }],
           ['OS=="win"', {
-            'sources': [
-              'src/hotplug/windows.cc'
-            ],
             'defines':[
               'WIN32_LEAN_AND_MEAN'
             ],

package/dist/usb/bindings.d.ts

@@ -1,4 +1,5 @@
 import type { DeviceDescriptor, ConfigDescriptor, BosDescriptor } from './descriptors';
+import type { ExtendedDevice } from './device';
 /**
  * Return a list of `Device` objects for the USB devices attached to the system.
  */
@@ -24,7 +25,7 @@ export declare function setDebugLevel(level: number): void;
  * Use USBDK Backend (Windows only)
  */
 export declare function useUsbDkBackend(): void;
-export declare function _supportedHotplugEvents(): number;
+export declare function _supportedHotplugEvents(): boolean;
 export declare function _enableHotplugEvents(): void;
 export declare function _disableHotplugEvents(): void;
 export declare function _getLibusbCapability(capability: number): number;
@@ -53,7 +54,7 @@ export declare class Transfer {
     cancel(): boolean;
 }
 /** Represents a USB device. */
-export declare class Device {
+export declare class Device extends ExtendedDevice {
     /** Integer USB device number */
     busNumber: number;
     /** Integer USB device address */
@@ -264,3 +265,27 @@ export declare const LIBUSB_ERROR_NO_MEM: number;
 export declare const LIBUSB_ERROR_NOT_SUPPORTED: number;
 /** Other error */
 export declare const LIBUSB_ERROR_OTHER: number;
+export declare interface EventListeners<T> {
+    newListener: keyof T;
+    removeListener: keyof T;
+}
+export declare interface DeviceIds {
+    idVendor: number;
+    idProduct: number;
+}
+export declare interface DeviceEvents extends EventListeners<DeviceEvents> {
+    attach: Device;
+    detach: Device;
+    attachIds: DeviceIds;
+    detachIds: DeviceIds;
+}
+export declare function addListener<K extends keyof DeviceEvents>(event: K, listener: (arg: DeviceEvents[K]) => void): void;
+export declare function removeListener<K extends keyof DeviceEvents>(event: K, listener: (arg: DeviceEvents[K]) => void): void;
+export declare function on<K extends keyof DeviceEvents>(event: K, listener: (arg: DeviceEvents[K]) => void): void;
+export declare function off<K extends keyof DeviceEvents>(event: K, listener: (arg: DeviceEvents[K]) => void): void;
+export declare function once<K extends keyof DeviceEvents>(event: K, listener: (arg: DeviceEvents[K]) => void): void;
+export declare function listeners<K extends keyof DeviceEvents>(event: K): ((arg: DeviceEvents[K]) => void)[];
+export declare function rawListeners<K extends keyof DeviceEvents>(event: K): ((arg: DeviceEvents[K]) => void)[];
+export declare function removeAllListeners<K extends keyof DeviceEvents>(event?: K): void;
+export declare function emit<K extends keyof DeviceEvents>(event: K, arg: DeviceEvents[K]): boolean;
+export declare function listenerCount<K extends keyof DeviceEvents>(event: K): number;

package/dist/usb/bindings.js.map

@@ -1 +1 @@
-{"version":3,"file":"bindings.js","sourceRoot":"","sources":["../../tsc/usb/bindings.ts"],"names":[],"mappings":";AAAA,+CAA+C;AAC/C,mDAAmD;AACnD,2CAA2C;;AAE3C,+BAA4B;AAG5B,uDAAuD;AACvD,MAAM,GAAG,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAChG,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC"}
+{"version":3,"file":"bindings.js","sourceRoot":"","sources":["../../tsc/usb/bindings.ts"],"names":[],"mappings":";AAAA,+CAA+C;AAC/C,mDAAmD;AACnD,2CAA2C;;AAE3C,+BAA4B;AAI5B,uDAAuD;AACvD,MAAM,GAAG,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAChG,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC"}

package/dist/usb/index.d.ts

@@ -1,31 +1,2 @@
-import { ExtendedDevice } from './device';
 import * as usb from './bindings';
-interface EventListeners<T> {
-    newListener: keyof T;
-    removeListener: keyof T;
-}
-interface DeviceIds {
-    idVendor: number;
-    idProduct: number;
-}
-declare module './bindings' {
-    interface Device extends ExtendedDevice {
-    }
-    interface DeviceEvents extends EventListeners<DeviceEvents> {
-        attach: Device;
-        detach: Device;
-        attachIds: DeviceIds;
-        detachIds: DeviceIds;
-    }
-    function addListener<K extends keyof DeviceEvents>(event: K, listener: (arg: DeviceEvents[K]) => void): void;
-    function removeListener<K extends keyof DeviceEvents>(event: K, listener: (arg: DeviceEvents[K]) => void): void;
-    function on<K extends keyof DeviceEvents>(event: K, listener: (arg: DeviceEvents[K]) => void): void;
-    function off<K extends keyof DeviceEvents>(event: K, listener: (arg: DeviceEvents[K]) => void): void;
-    function once<K extends keyof DeviceEvents>(event: K, listener: (arg: DeviceEvents[K]) => void): void;
-    function listeners<K extends keyof DeviceEvents>(event: K): ((arg: DeviceEvents[K]) => void)[];
-    function rawListeners<K extends keyof DeviceEvents>(event: K): ((arg: DeviceEvents[K]) => void)[];
-    function removeAllListeners<K extends keyof DeviceEvents>(event?: K): void;
-    function emit<K extends keyof DeviceEvents>(event: K, arg: DeviceEvents[K]): boolean;
-    function listenerCount<K extends keyof DeviceEvents>(event: K): number;
-}
 export = usb;

package/dist/usb/index.js

@@ -55,26 +55,17 @@ const pollHotplug = (start = false) => {
     }
     setTimeout(() => pollHotplug(), usb.pollHotplugDelay);
 };
-// Devices changed event handler
-const devicesChanged = () => setTimeout(() => emitHotplugEvents(), usb.pollHotplugDelay);
 // Hotplug control
-let hotplugSupported = 0;
+let hotplugSupported = false;
 const startHotplug = () => {
-    hotplugSupported = usb.pollHotplug ? 0 : usb._supportedHotplugEvents();
-    if (hotplugSupported !== 1) {
-        // Collect initial devices when not using libusb
-        hotPlugDevices = new Set(usb.getDeviceList());
-    }
+    hotplugSupported = usb.pollHotplug ? false : usb._supportedHotplugEvents();
     if (hotplugSupported) {
         // Use hotplug event emitters
         usb._enableHotplugEvents();
-        if (hotplugSupported === 2) {
-            // Use hotplug ID events to trigger a change check
-            usb.on('attachIds', devicesChanged);
-            usb.on('detachIds', devicesChanged);
-        }
     }
     else {
+        // Collect initial devices
+        hotPlugDevices = new Set(usb.getDeviceList());
         // Fallback to using polling to check for changes
         pollHotplug(true);
     }
@@ -83,11 +74,6 @@ const stopHotplug = () => {
     if (hotplugSupported) {
         // Disable hotplug events
         usb._disableHotplugEvents();
-        if (hotplugSupported === 2) {
-            // Remove hotplug ID event listeners
-            usb.off('attachIds', devicesChanged);
-            usb.off('detachIds', devicesChanged);
-        }
     }
     else {
         // Stop polling

package/dist/usb/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../tsc/usb/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../tsc/usb/index.ts"],"names":[],"mappings":"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"}

package/libusb/.clang-tidy

@@ -6,6 +6,8 @@ bugprone-*,\
 -bugprone-narrowing-conversions,\
 -bugprone-signed-char-misuse,\
 -bugprone-switch-missing-default-case,\
+-bugprone-multi-level-implicit-pointer-conversion,\
+-bugprone-branch-clone,\
 clang-analyzer-*,\
 -clang-analyzer-core.NullDereference,\
 -clang-analyzer-deadcode.DeadStores,\
@@ -16,11 +18,11 @@ clang-analyzer-*,\
 misc-*,\
 -misc-no-recursion,\
 -misc-include-cleaner,\
+-misc-unused-parameters,\
 modernize-*,\
 -modernize-macro-to-enum,\
 performance-*,\
 -performance-no-int-to-ptr,\
--performance-type-promotion-in-math-fn,\
 portability-*,\
 readability-*,\
 -readability-braces-around-statements,\
@@ -29,6 +31,6 @@ readability-*,\
 -readability-function-cognitive-complexity,\
 -readability-isolate-declaration,\
 -readability-magic-numbers,\
+-readability-non-const-parameter,\
+-readability-use-concise-preprocessor-directives,\
 "
-#WarningsAsErrors: "*"
-...

package/libusb/.private/ci-build.sh

@@ -30,6 +30,10 @@ while [ $# -gt 0 ]; do
 		asan=no
 		shift
 		;;
+	--werror)
+		cflags+=" -Werror"
+		shift
+		;;
 	--)
 		shift
 		break;
@@ -53,7 +57,7 @@ fi
 mkdir "${builddir}"
 cd "${builddir}"
 
-cflags="-O2"
+cflags+=" -O2"
 
 # enable extra warnings
 cflags+=" -Winline"

package/libusb/AUTHORS

@@ -15,6 +15,7 @@ Aaron Luft
 Adam Korcz
 Addison Crump
 Adrian Bunk
+Adrien Bertrand
 Adrien Destugues
 Akshay Jaggi
 Alan Ott
@@ -24,6 +25,7 @@ Alexander Mot
 Alexander Pyhalov
 Alexander Schlarb
 Alexander Stein
+Alex Birkett
 Alex Feinman
 Alex Vatchenko
 Andrew Aldridge
@@ -35,6 +37,7 @@ Angus Gratton
 Anil Nair
 Ankur Verma
 Anthony Clay
+Antoine Moreau
 Antonio Ospite
 Artem Egorkine
 Aurelien Jarno
@@ -84,8 +87,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,20 +129,24 @@ 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
 Mario Kleiner
 Mark Kuo
+Mark Lee
 Markus Heidelberg
 Martin Ettl
 Martin Koegler
 Martin Ling
 Martin Thierer
 Mathias Hjärtström
+Matt Liberty
 Matthew Stapleton
 Matthias Bolte
 Matthijs Lavrijsen
@@ -151,7 +160,9 @@ Moritz Fischer
 Nancy Li
 Nia Alarie
 Nicholas Corgan
+Nicolas Bats
 Niklas Gürtler
+Ole André Vadla Ravnås
 Oleksand Radovenchyk
 Omri Iluz
 Orhan aib Kavrakoglu
@@ -191,6 +202,7 @@ Steinar H. Gunderson
 Stephen Groat
 Sylvain Fasel
 Theo Buehler
+Theodor Engøy
 Thomas Röfer
 Tim Hutt
 Tim Roberts
@@ -200,6 +212,7 @@ Tormod Volden
 Trygve Laugstøl
 Uri Lublin
 Uwe Bonnes
+Vadim Mikhailov
 Vasily Khoruzhick
 Vegard Storheil Eriksen
 Venkatesh Shukla
@@ -208,6 +221,7 @@ Victor Toso
 Vinicius Tinti
 Vitali Lovich
 Vladimir Beloborodov
+Vladimir Gladkov
 William Orr
 William Skellenger
 Xiaofan Chen

package/libusb/ChangeLog

@@ -1,5 +1,18 @@
-For detailed information about the changes below, please see the git log
-or visit: http://log.libusb.info
+For detailed information about the changes below, please see the git log.
+
+2026-05-17: v1.0.30
+* 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
+* Add new API libusb_get_device_string() to access device strings without opening the device
+* Add new API libusb_get_session_data() which returns the OS-specific handle
+* Fix device removal races on non-hotplug builds
+* Improve descriptor parsing memory safety
+* On Darwin, fix concurrency issues
+* On Android, fix intermittent failures in get_usbfs_fd()
+* On Windows, fix bus number assignment for root hub device, preventing duplicate bus number assignments
+* Fix compilation with Microsoft Visual Studio 2026
+* Fix various compiler warnings, improved tests and examples
 
 2025-06-01: v1.0.29
 * Fix regression on macOS leading to timeouts in enumeration

package/libusb/README

@@ -20,10 +20,13 @@ http://api.libusb.info
 Use the mailing list for questions, comments, etc:
 http://mailing-list.libusb.info
 
-- Hans de Goede <hdegoede@redhat.com>
-- Xiaofan Chen <xiaofanc@gmail.com>
-- Ludovic Rousseau <ludovic.rousseau@gmail.com>
-- Nathan Hjelm <hjelmn@cs.unm.edu>
-- Chris Dickens <christopher.a.dickens@gmail.com>
+- Tormod Volden
+- Sylvain Fasel
+- Sean McBride
+- Nathan Hjelm
+- Xiaofan Chen
+- Hans de Goede
+- Ludovic Rousseau
+- Chris Dickens
 
 (Please use the mailing list rather than mailing developers directly)

package/libusb/Xcode/libusb.xcodeproj/project.pbxproj

@@ -272,6 +272,8 @@
 		1443EE8716417E63007E0579 /* libusb.xcconfig */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.xcconfig; path = libusb.xcconfig; sourceTree = SOURCE_ROOT; tabWidth = 4; usesTabs = 1; };
 		1443EE8816417E63007E0579 /* release.xcconfig */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = SOURCE_ROOT; tabWidth = 4; usesTabs = 1; };
 		1443EE8916417EA6007E0579 /* libusb_release.xcconfig */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.xcconfig; path = libusb_release.xcconfig; sourceTree = SOURCE_ROOT; tabWidth = 4; usesTabs = 1; };
+		145F5D8D2E60B46B004ABA5D /* windows_hotplug.h */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = windows_hotplug.h; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
+		145F5D8E2E60B46B004ABA5D /* windows_hotplug.c */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.c.c; path = windows_hotplug.c; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
 		14EC13E12B3D5BA600CF9AD0 /* emscripten_webusb.cpp */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = emscripten_webusb.cpp; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
 		14EC13E22B3D5BBE00CF9AD0 /* sunos_usb.h */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = sunos_usb.h; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
 		14EC13E32B3D5BBE00CF9AD0 /* openbsd_usb.c */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.c.c; path = openbsd_usb.c; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
@@ -493,6 +495,8 @@
 				14EC13F72B3D5BC800CF9AD0 /* threads_windows.h */,
 				14EC13F52B3D5BC800CF9AD0 /* windows_common.c */,
 				14EC13F22B3D5BC800CF9AD0 /* windows_common.h */,
+				145F5D8D2E60B46B004ABA5D /* windows_hotplug.h */,
+				145F5D8E2E60B46B004ABA5D /* windows_hotplug.c */,
 				14EC13F92B3D5BC800CF9AD0 /* windows_usbdk.c */,
 				14EC13F82B3D5BC800CF9AD0 /* windows_usbdk.h */,
 				14EC13F42B3D5BC800CF9AD0 /* windows_winusb.c */,

package/libusb/configure.ac

@@ -31,9 +31,9 @@ dnl Library versioning
 dnl These numbers should be tweaked on every release. Read carefully:
 dnl http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 dnl http://sourceware.org/autobook/autobook/autobook_91.html
-lt_current=5
+lt_current=6
 lt_revision=0
-lt_age=5
+lt_age=6
 LT_LDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age} -no-undefined"
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@ -397,10 +397,20 @@ AM_CONDITIONAL([OS_EMSCRIPTEN], [test "x$backend" = xemscripten])
 AM_CONDITIONAL([PLATFORM_POSIX], [test "x$platform" = xposix])
 AM_CONDITIONAL([PLATFORM_WINDOWS], [test "x$platform" = xwindows])
 AM_CONDITIONAL([USE_UDEV], [test "x$use_udev" = xyes])
+AM_CONDITIONAL([LIBUSB_WINDOWS_HOTPLUG], [test "x$enable_windows_hotplug" = xyes])
 
 dnl The -Wcast-function-type warning causes a flurry of warnings when compiling
 dnl Windows with GCC 8 or later because of dynamically loaded functions
 if test "x$backend" = xwindows; then
+	AC_ARG_ENABLE([windows-hotplug],
+	AS_HELP_STRING([--enable-windows-hotplug], [Enable Windows hotplug support]),
+	[enable_windows_hotplug="$enableval"],
+	[enable_windows_hotplug=no])
+
+	if test "x$enable_windows_hotplug" = "xyes"; then
+		AC_DEFINE([LIBUSB_WINDOWS_HOTPLUG], [1], [Define to enable Windows hotplug support])
+	fi
+
 	saved_CFLAGS="${CFLAGS}"
 	CFLAGS="-Werror -Wcast-function-type"
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])],

package/libusb/examples/hotplugtest.c

@@ -23,12 +23,14 @@
 
 #include "libusb.h"
 
-int done = 0;
+int done_attach = 0;
+int done_detach = 0;
 libusb_device_handle *handle = NULL;
 
 static int LIBUSB_CALL hotplug_callback(libusb_context *ctx, libusb_device *dev, libusb_hotplug_event event, void *user_data)
 {
 	struct libusb_device_descriptor desc;
+	libusb_device_handle *new_handle;
 	int rc;
 
 	(void)ctx;
@@ -45,18 +47,23 @@ static int LIBUSB_CALL hotplug_callback(libusb_context *ctx, libusb_device *dev,
 			 libusb_strerror((enum libusb_error)rc));
 	}
 
-	if (handle) {
-		libusb_close (handle);
-		handle = NULL;
-	}
-
-	rc = libusb_open (dev, &handle);
-	if (LIBUSB_SUCCESS != rc) {
+	rc = libusb_open (dev, &new_handle);
+	if (LIBUSB_SUCCESS == rc) {
+		if (handle) {
+			libusb_close (handle);
+		}
+		handle = new_handle;
+	} else if (LIBUSB_ERROR_ACCESS != rc
+#if defined(PLATFORM_WINDOWS)
+		&& LIBUSB_ERROR_NOT_SUPPORTED != rc
+		&& LIBUSB_ERROR_NOT_FOUND != rc
+#endif
+		) {
 		fprintf (stderr, "No access to device: %s\n",
 			 libusb_strerror((enum libusb_error)rc));
 	}
 
-	done++;
+	done_attach++;
 
 	return 0;
 }
@@ -85,7 +92,7 @@ static int LIBUSB_CALL hotplug_callback_detach(libusb_context *ctx, libusb_devic
 		handle = NULL;
 	}
 
-	done++;
+	done_detach++;
 
 	return 0;
 }
@@ -130,7 +137,7 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	while (done < 2) {
+	while (done_detach < done_attach || done_attach == 0) {
 		rc = libusb_handle_events (NULL);
 		if (LIBUSB_SUCCESS != rc)
 			printf ("libusb_handle_events() failed: %s\n",
@@ -138,6 +145,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (handle) {
+		printf ("Warning: Closing left-over open handle\n");
 		libusb_close (handle);
 	}
 

package/libusb/examples/listdevs.c

@@ -18,14 +18,16 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #include "libusb.h"
 
-static void print_devs(libusb_device **devs)
+static void print_devs(libusb_device **devs, int verbose)
 {
 	libusb_device *dev;
 	int i = 0, j = 0;
 	uint8_t path[8]; 
+	char string_buffer[LIBUSB_DEVICE_STRING_BYTES_MAX];
 
 	while ((dev = devs[i++]) != NULL) {
 		struct libusb_device_descriptor desc;
@@ -45,16 +47,52 @@ static void print_devs(libusb_device **devs)
 			for (j = 1; j < r; j++)
 				printf(".%d", path[j]);
 		}
+
+		if (verbose) {
+			r = libusb_get_device_string(dev, LIBUSB_DEVICE_STRING_MANUFACTURER,
+				string_buffer, sizeof(string_buffer));
+			if (r >= 0) {
+				printf("\n    manufacturer = %s", string_buffer);
+			}
+
+			r = libusb_get_device_string(dev, LIBUSB_DEVICE_STRING_PRODUCT,
+				string_buffer, sizeof(string_buffer));
+			if (r >= 0) {
+				printf("\n    product = %s", string_buffer);
+			}
+
+			r = libusb_get_device_string(dev, LIBUSB_DEVICE_STRING_SERIAL_NUMBER,
+				string_buffer, sizeof(string_buffer));
+			if (r >= 0) {
+				printf("\n    serial_number = %s", string_buffer);
+			}
+		}
 		printf("\n");
 	}
 }
 
-int main(void)
+static int usage(void) {
+	printf("usage: listdevs [--verbose]\n");
+	return 1;
+}
+
+int main(int argc, char *argv[])
 {
+	int verbose = 0;
 	libusb_device **devs;
 	int r;
 	ssize_t cnt;
 
+	--argc; ++argv;  /* consume argument */
+	while (argc) {
+		if ((0 == strcmp("-v", argv[0])) || (0 == strcmp("--verbose", argv[0]))) {
+			++verbose;
+			--argc; ++argv;  /* consume argument */
+		} else {
+			return usage();
+		}
+	}
+
 	r = libusb_init_context(/*ctx=*/NULL, /*options=*/NULL, /*num_options=*/0);
 	if (r < 0)
 		return r;
@@ -65,7 +103,7 @@ int main(void)
 		return (int) cnt;
 	}
 
-	print_devs(devs);
+	print_devs(devs, verbose);
 	libusb_free_device_list(devs, 1);
 
 	libusb_exit(NULL);

package/libusb/examples/xusb.c

@@ -31,6 +31,11 @@
 #if defined(_MSC_VER)
 #define snprintf _snprintf
 #define putenv _putenv
+/* Disable: warning C5287: operands are different enum types */
+#if (_MSC_VER > 1800)
+/* Disable: warning C5287: operands are different enum types, supported after Visual Studio 2013 */
+#pragma warning(disable:5287)
+#endif
 #endif
 
 // Future versions of libusb will use usb_interface instead of interface
@@ -498,7 +503,7 @@ static int test_mass_storage(libusb_device_handle *handle, uint8_t endpoint_in,
 	for (i=0; i<8; i++) {
 		vid[i] = buffer[8+i];
 		pid[i] = buffer[16+i];
-		rev[i/2] = buffer[32+i/2];	// instead of another loop
+		rev[i/2] = buffer[32+(i/2)];	// instead of another loop
 	}
 	vid[8] = 0;
 	pid[8] = 0;

package/libusb/libusb/Makefile.am

@@ -30,6 +30,10 @@ OS_WINDOWS_SRC = libusb-1.0.def libusb-1.0.rc \
 		 os/windows_usbdk.h os/windows_usbdk.c \
 		 os/windows_winusb.h os/windows_winusb.c
 
+if LIBUSB_WINDOWS_HOTPLUG
+OS_WINDOWS_SRC += os/windows_hotplug.h os/windows_hotplug.c
+endif	 
+
 if OS_DARWIN
 OS_SRC = $(OS_DARWIN_SRC)
 endif