usb 2.17.0 → 2.18.0

package/libusb/libusb/os/windows_winusb.h

@@ -87,6 +87,9 @@ struct windows_usb_api_backend {
 	int (*submit_control_transfer)(int sub_api, struct usbi_transfer *itransfer);
 	int (*cancel_transfer)(int sub_api, struct usbi_transfer *itransfer);
 	enum libusb_transfer_status (*copy_transfer_data)(int sub_api, struct usbi_transfer *itransfer, DWORD length);
+	int (*endpoint_supports_raw_io)(int sub_api, struct libusb_device_handle *dev_handle, uint8_t endpoint);
+	int (*endpoint_set_raw_io)(int sub_api, struct libusb_device_handle *dev_handle, uint8_t endpoint, int enable);
+	int (*get_max_raw_io_transfer_size)(int sub_api, struct libusb_device_handle *dev_handle, uint8_t endpoint);
 };
 
 extern const struct windows_usb_api_backend usb_api_backend[USB_API_MAX];
@@ -176,6 +179,7 @@ static inline struct winusb_device_priv *winusb_device_priv_init(struct libusb_d
 	struct winusb_device_priv *priv = usbi_get_device_priv(dev);
 	int i;
 
+	usbi_mutex_init(&priv->interface_lock);
 	priv->apib = &usb_api_backend[USB_API_UNSUPPORTED];
 	priv->sub_api = SUB_API_NOTSET;
 	for (i = 0; i < USB_MAXINTERFACES; i++) {
@@ -206,6 +210,7 @@ static inline void winusb_device_priv_release(struct libusb_device *dev)
 		free(priv->usb_interface[i].path);
 		free(priv->usb_interface[i].endpoint);
 	}
+	usbi_mutex_destroy(&priv->interface_lock);
 }
 
 // used to match a device driver (including filter drivers) against a supported API
@@ -307,7 +312,7 @@ typedef enum _USB_HUB_NODE {
 #endif
 
 // Most of the structures below need to be packed
-#include <pshpack1.h>
+#pragma pack(push, 1)
 
 typedef struct _USB_HUB_DESCRIPTOR {
 	UCHAR bDescriptorLength;
@@ -401,7 +406,7 @@ typedef struct _USB_NODE_CONNECTION_INFORMATION_EX_V2 {
 	USB_NODE_CONNECTION_INFORMATION_EX_V2_FLAGS Flags;
 } USB_NODE_CONNECTION_INFORMATION_EX_V2, *PUSB_NODE_CONNECTION_INFORMATION_EX_V2;
 
-#include <poppack.h>
+#pragma pack(pop)
 
 #if defined(_MSC_VER)
 // Restore original warnings
@@ -443,7 +448,7 @@ typedef struct {
 	ULONG MaximumBytesPerInterval;
 } WINUSB_PIPE_INFORMATION_EX, *PWINUSB_PIPE_INFORMATION_EX;
 
-#include <pshpack1.h>
+#pragma pack(push, 1)
 
 typedef struct _WINUSB_SETUP_PACKET {
 	UCHAR RequestType;
@@ -453,7 +458,7 @@ typedef struct _WINUSB_SETUP_PACKET {
 	USHORT Length;
 } WINUSB_SETUP_PACKET, *PWINUSB_SETUP_PACKET;
 
-#include <poppack.h>
+#pragma pack(pop)
 
 typedef PVOID WINUSB_INTERFACE_HANDLE, *PWINUSB_INTERFACE_HANDLE;
 typedef PVOID WINUSB_ISOCH_BUFFER_HANDLE, *PWINUSB_ISOCH_BUFFER_HANDLE;
@@ -695,7 +700,7 @@ struct winusb_interface {
 #define HIDP_STATUS_SUCCESS	0x110000
 typedef void * PHIDP_PREPARSED_DATA;
 
-#include <pshpack1.h>
+#pragma pack(push, 1)
 
 typedef struct _HIDD_ATTIRBUTES {
 	ULONG Size;
@@ -704,7 +709,7 @@ typedef struct _HIDD_ATTIRBUTES {
 	USHORT VersionNumber;
 } HIDD_ATTRIBUTES, *PHIDD_ATTRIBUTES;
 
-#include <poppack.h>
+#pragma pack(pop)
 
 typedef USHORT USAGE;
 typedef struct _HIDP_CAPS {

package/libusb/libusb/version.h

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

package/libusb/libusb/version_nano.h

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

package/libusb/msvc/Base.props

@@ -15,7 +15,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <!--Treat sources as utf-8-->
-      <AdditionalOptions Condition="'$(PlatformToolsetVersion)'&gt;'120'">/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(LibusbPlatformToolsetVersion)'&gt;'120'">/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DiagnosticsFormat>Caret</DiagnosticsFormat>
     </ClCompile>

package/libusb/msvc/Configuration.Base.props

@@ -7,6 +7,7 @@
     <PlatformToolset Condition="$(VisualStudioVersion)=='15.0'">v141</PlatformToolset>
     <PlatformToolset Condition="$(VisualStudioVersion)=='16.0'">v142</PlatformToolset>
     <PlatformToolset Condition="$(VisualStudioVersion)=='17.0'">v143</PlatformToolset>
+    <PlatformToolset Condition="$(VisualStudioVersion)=='18.0'">v145</PlatformToolset>
     <!--We may need the equivalent of PlatformToolsetVersion before it's ready, so create it ourself-->
     <LibusbPlatformToolsetVersion>$(PlatformToolset.Substring(1))</LibusbPlatformToolsetVersion>
     <CharacterSet>Unicode</CharacterSet>
@@ -44,4 +45,4 @@
   <PropertyGroup Label="Globals" Condition="'$(LibusbPlatformToolsetVersion)'&gt;='142'">
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-</Project>
+</Project>

package/libusb/msvc/Configuration.DynamicLibrary.props

@@ -7,15 +7,27 @@
   <ItemDefinitionGroup>
     <ClCompile Condition="'$(Configuration)'=='Debug'">
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+	<ClCompile Condition="'$(Configuration)'=='Debug-Hotplug'">
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
 	<ClCompile Condition="'$(Configuration)'=='Debug-MT'">
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+	<ClCompile Condition="'$(Configuration)'=='Debug-Hotplug-MT'">
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <ClCompile Condition="'$(Configuration)'=='Release'">
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+	<ClCompile Condition="'$(Configuration)'=='Release-Hotplug'">
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
 	<ClCompile Condition="'$(Configuration)'=='Release-MT'">
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+	<ClCompile Condition="'$(Configuration)'=='Release-Hotplug-MT'">
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
 </Project>

package/libusb/msvc/ProjectConfigurations.Base.props

@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="ShowHotplugState" BeforeTargets="ClCompile">
+    <Message Condition="'$(EnableWindowsHotplug)' == 'true'" Text="EnableWindowsHotplug is enabled" Importance="High" />
+    <Message Condition="'$(EnableWindowsHotplug)' != 'true'" Text="EnableWindowsHotplug is disabled" Importance="High" />
+  </Target>
+  <ItemDefinitionGroup Condition="'$(EnableWindowsHotplug)' == 'true'">
+    <ClCompile>
+      <PreprocessorDefinitions>LIBUSB_WINDOWS_HOTPLUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
@@ -17,10 +22,6 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|ARM64">
       <Configuration>Release</Configuration>
       <Platform>ARM64</Platform>
@@ -32,10 +33,6 @@
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
-    </ProjectConfiguration>
-	<ProjectConfiguration Include="Debug-MT|ARM">
-      <Configuration>Debug-MT</Configuration>
-      <Platform>ARM</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-MT|ARM64">
       <Configuration>Debug-MT</Configuration>
@@ -48,10 +45,6 @@
     <ProjectConfiguration Include="Debug-MT|x64">
       <Configuration>Debug-MT</Configuration>
       <Platform>x64</Platform>
-    </ProjectConfiguration>
-	 <ProjectConfiguration Include="Release-MT|ARM">
-      <Configuration>Release-MT</Configuration>
-      <Platform>ARM</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release-MT|ARM64">
       <Configuration>Release-MT</Configuration>
@@ -65,5 +58,65 @@
       <Configuration>Release-MT</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Hotplug|ARM64">
+      <Configuration>Debug-Hotplug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Hotplug|Win32">
+      <Configuration>Debug-Hotplug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Hotplug|x64">
+      <Configuration>Debug-Hotplug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Hotplug|ARM64">
+      <Configuration>Release-Hotplug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Hotplug|Win32">
+      <Configuration>Release-Hotplug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Hotplug|x64">
+      <Configuration>Release-Hotplug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Hotplug-MT|ARM64">
+      <Configuration>Debug-Hotplug-MT</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Hotplug-MT|Win32">
+      <Configuration>Debug-Hotplug-MT</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Hotplug-MT|x64">
+      <Configuration>Debug-Hotplug-MT</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Hotplug-MT|ARM64">
+      <Configuration>Release-Hotplug-MT</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Hotplug-MT|Win32">
+      <Configuration>Release-Hotplug-MT</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Hotplug-MT|x64">
+      <Configuration>Release-Hotplug-MT</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
+	<PropertyGroup Condition="'$(Configuration)' == 'Debug-Hotplug'">
+		<EnableWindowsHotplug>true</EnableWindowsHotplug>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)' == 'Debug-Hotplug-MT'">
+		<EnableWindowsHotplug>true</EnableWindowsHotplug>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)' == 'Release-Hotplug'">
+		<EnableWindowsHotplug>true</EnableWindowsHotplug>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)' == 'Release-Hotplug-MT'">
+		<EnableWindowsHotplug>true</EnableWindowsHotplug>
+	</PropertyGroup>
 </Project>

package/libusb/msvc/build_all.ps1

@@ -1,4 +1,4 @@
-$toolsets = "v120", "v140", "v141", "v142", "v143"
+$toolsets = "v120", "v140", "v141", "v142", "v143", "v145"
 $platforms = "Win32", "x64", "ARM", "ARM64"
 $configurations = "Debug", "Release"
 
@@ -14,4 +14,4 @@ foreach ($toolset in $toolsets) {
             msbuild -m -v:m -p:PlatformToolset=$toolset,Platform=$plat,Configuration=$conf $PSScriptRoot\libusb.sln
         }
     }
-}
+}

package/libusb/msvc/config.h

@@ -30,6 +30,10 @@
 #pragma warning(disable:4324)
 /* Disable: warning C4996: 'GetVersionExA': was declared deprecated */
 #pragma warning(disable:4996)
+#if (_MSC_VER > 1800)
+/* Disable: warning C5287: operands are different enum types, supported after Visual Studio 2013 */
+#pragma warning(disable:5287)
+#endif
 
 #if defined(_PREFAST_)
 /* Disable "Banned API" errors when using the MS's WDK OACR/Prefast */

package/libusb/msvc/getopt/bits/getopt_core.h

@@ -0,0 +1,96 @@
+/* Declarations for getopt (basic, portable features only).
+   Copyright (C) 1989-2026 Free Software Foundation, Inc.
+   This file is part of the GNU C Library and is also part of gnulib.
+   Patches to this file should be submitted to both projects.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _GETOPT_CORE_H
+#define _GETOPT_CORE_H 1
+
+/* This header should not be used directly; include getopt.h or
+   unistd.h instead.  Unlike most bits headers, it does not have
+   a protective #error, because the guard macro for getopt.h in
+   gnulib is not fixed.  */
+
+__BEGIN_DECLS
+
+/* For communication from 'getopt' to the caller.
+   When 'getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when 'ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to 'getopt'.
+
+   On entry to 'getopt', zero means this is the first call; initialize.
+
+   When 'getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, 'optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message 'getopt' prints
+   for unrecognized options.  */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized.  */
+
+extern int optopt;
+
+/* Get definitions and prototypes for functions to process the
+   arguments in ARGV (ARGC of them, minus the program name) for
+   options given in OPTS.
+
+   Return the option character from OPTS just read.  Return -1 when
+   there are no more options.  For unrecognized options, or options
+   missing arguments, 'optopt' is set to the option letter, and '?' is
+   returned.
+
+   The OPTS string is a list of characters which are recognized option
+   letters, optionally followed by colons, specifying that that letter
+   takes an argument, to be placed in 'optarg'.
+
+   If a letter in OPTS is followed by two colons, its argument is
+   optional.  This behavior is specific to the GNU 'getopt'.
+
+   The argument '--' causes premature termination of argument
+   scanning, explicitly telling 'getopt' that there are no more
+   options.
+
+   If OPTS begins with '-', then non-option arguments are treated as
+   arguments to the option '\1'.  This behavior is specific to the GNU
+   'getopt'.  If OPTS begins with '+', or POSIXLY_CORRECT is set in
+   the environment, then do not permute arguments.
+
+   For standards compliance, the 'argv' argument has the type
+   char *const *, but this is inaccurate; if argument permutation is
+   enabled, the argv array (not the strings it points to) must be
+   writable.  */
+
+extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
+       __THROW __nonnull ((2, 3));
+
+__END_DECLS
+
+#endif /* getopt_core.h */

package/libusb/msvc/getopt/bits/getopt_ext.h

@@ -0,0 +1,77 @@
+/* Declarations for getopt (GNU extensions).
+   Copyright (C) 1989-2026 Free Software Foundation, Inc.
+   This file is part of the GNU C Library and is also part of gnulib.
+   Patches to this file should be submitted to both projects.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _GETOPT_EXT_H
+#define _GETOPT_EXT_H 1
+
+/* This header should not be used directly; include getopt.h instead.
+   Unlike most bits headers, it does not have a protective #error,
+   because the guard macro for getopt.h in gnulib is not fixed.  */
+
+__BEGIN_DECLS
+
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+   of 'struct option' terminated by an element containing a name which is
+   zero.
+
+   The field 'has_arg' is:
+   no_argument		(or 0) if the option does not take an argument,
+   required_argument	(or 1) if the option requires an argument,
+   optional_argument 	(or 2) if the option takes an optional argument.
+
+   If the field 'flag' is not NULL, it points to a variable that is set
+   to the value given in the field 'val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an 'int' to
+   a compiled-in constant, such as set a value from 'optarg', set the
+   option's 'flag' field to zero and its 'val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero 'flag' field, 'getopt'
+   returns the contents of the 'val' field.  */
+
+struct option
+{
+  const char *name;
+  /* has_arg can't be an enum because some compilers complain about
+     type mismatches in all the code that assumes it is an int.  */
+  int has_arg;
+  int *flag;
+  int val;
+};
+
+/* Names for the values of the 'has_arg' field of 'struct option'.  */
+
+#define no_argument		0
+#define required_argument	1
+#define optional_argument	2
+
+extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv,
+			const char *__shortopts,
+		        const struct option *__longopts, int *__longind)
+       __THROW __nonnull ((2, 3));
+extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind)
+       __THROW __nonnull ((2, 3));
+
+__END_DECLS
+
+#endif /* getopt_ext.h */

package/libusb/msvc/getopt/features.h

@@ -0,0 +1,21 @@
+/* Minimal features.h shim for standalone getopt build on MSVC. */
+#ifndef _FEATURES_H
+#define _FEATURES_H 1
+
+#ifdef __cplusplus
+# define __BEGIN_DECLS extern "C" {
+# define __END_DECLS }
+#else
+# define __BEGIN_DECLS
+# define __END_DECLS
+#endif
+
+#ifndef __THROW
+# define __THROW
+#endif
+
+#ifndef __nonnull
+# define __nonnull(params)
+#endif
+
+#endif /* _FEATURES_H */