usb 2.1.3 → 2.3.1

package/libusb/msvc/{xusb_2010.vcxproj → xusb_2019.vcxproj}

@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +17,14 @@
       <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>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -23,11 +39,15 @@
     <ProjectGuid>{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}</ProjectGuid>
     <RootNamespace>examples</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -45,14 +65,13 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <ClCompile Condition="'$(Configuration)'=='Debug'">
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <MinimalRebuild>true</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <ClCompile Condition="'$(Configuration)'=='Release'">
@@ -62,6 +81,7 @@
     <Link>
       <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Link Condition="'$(Configuration)'=='Debug'">
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -71,7 +91,10 @@
     <ClCompile Include="..\examples\xusb.c" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include=".\libusb_static_2010.vcxproj">
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2019.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
@@ -79,4 +102,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

package/libusb/msvc/xusb_2019.vcxproj.filters

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4bdcefa9-8c79-431b-965b-15b234737380}</UniqueIdentifier>
+      <Extensions>c</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{f81e24cd-e12b-4324-ada3-accbab00ef08}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\xusb.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

package/libusb/tests/Makefile.am

@@ -1,6 +1,18 @@
 AM_CPPFLAGS = -I$(top_srcdir)/libusb
 LDADD = ../libusb/libusb-1.0.la
+LIBS =
+
+stress_SOURCES = stress.c libusb_testlib.h testlib.c
 
 noinst_PROGRAMS = stress
 
-stress_SOURCES = stress.c libusb_testlib.h testlib.c
+if BUILD_UMOCKDEV_TEST
+# NOTE: We add libumockdev-preload.so so that we can run tests in-process
+#       We also use -Wl,-lxxx as the compiler doesn't need it and libtool
+#       would reorder the flags otherwise.
+umockdev_CPPFLAGS = ${UMOCKDEV_CFLAGS} -I$(top_srcdir)/libusb
+umockdev_LDFLAGS = -Wl,--push-state,--no-as-needed -Wl,-lumockdev-preload -Wl,--pop-state ${UMOCKDEV_LIBS}
+umockdev_SOURCES = umockdev.c
+
+noinst_PROGRAMS += umockdev
+endif

package/libusb/tests/libusb_testlib.h

@@ -20,17 +20,7 @@
 #ifndef LIBUSB_TESTLIB_H
 #define LIBUSB_TESTLIB_H
 
-#include <stdio.h>
-
-#if !defined(bool)
-#define bool int
-#endif
-#if !defined(true)
-#define true (1 == 1)
-#endif
-#if !defined(false)
-#define false (!true)
-#endif
+#include <config.h>
 
 /** Values returned from a test function to indicate test result */
 typedef enum {
@@ -41,53 +31,33 @@ typedef enum {
 	/** Indicates that an unexpected error occurred. */
 	TEST_STATUS_ERROR,
 	/** Indicates that the test can't be run. For example this may be
-	* due to no suitable device being connected to perform the tests.*/
+	 * due to no suitable device being connected to perform the tests. */
 	TEST_STATUS_SKIP
 } libusb_testlib_result;
 
-/**
- * Context for test library functions
- */
-typedef struct {
-	char ** test_names;
-	int test_count;
-	bool list_tests;
-	bool verbose;
-	int old_stdout;
-	int old_stderr;
-	FILE* output_file;
-	int null_fd;
-} libusb_testlib_ctx;
-
 /**
  * Logs some test information or state
  */
-void libusb_testlib_logf(libusb_testlib_ctx * ctx, 
-                          const char* fmt, ...);
-
-/**
- * Function pointer for a libusb test function.
- *
- * Should return TEST_STATUS_SUCCESS on success or another TEST_STATUS value.
- */
-typedef libusb_testlib_result
-(*libusb_testlib_test_function)(libusb_testlib_ctx * ctx);
+void libusb_testlib_logf(const char *fmt, ...) PRINTF_FORMAT(1, 2);
 
 /**
  * Structure holding a test description.
  */
 typedef struct {
 	/** Human readable name of the test. */
-	const char * name;
-	/** The test library will call this function to run the test. */
-	libusb_testlib_test_function function;
+	const char *name;
+	/** The test library will call this function to run the test.
+	 *
+	 * Should return TEST_STATUS_SUCCESS on success or another TEST_STATUS value.
+	 */
+	libusb_testlib_result (*function)(void);
 } libusb_testlib_test;
 
 /**
  * Value to use at the end of a test array to indicate the last
  * element.
  */
-#define LIBUSB_NULL_TEST {NULL, NULL}
+#define LIBUSB_NULL_TEST { NULL, NULL }
 
 /**
  * Runs the tests provided.
@@ -100,8 +70,7 @@ typedef struct {
  * \param tests A NULL_TEST terminated array of tests
  * \return 0 on success, non-zero on failure
  */
-int libusb_testlib_run_tests(int argc,
-                              char ** argv,
-                              const libusb_testlib_test * tests);
+int libusb_testlib_run_tests(int argc, char *argv[],
+	const libusb_testlib_test *tests);
 
 #endif //LIBUSB_TESTLIB_H

package/libusb/tests/stress.c

@@ -17,122 +17,131 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <stdio.h>
+#include <config.h>
+
 #include <string.h>
-#include <memory.h>
 
 #include "libusb.h"
 #include "libusb_testlib.h"
 
 /** Test that creates and destroys a single concurrent context
  * 10000 times. */
-static libusb_testlib_result test_init_and_exit(libusb_testlib_ctx * tctx)
+static libusb_testlib_result test_init_and_exit(void)
 {
-	libusb_context * ctx = NULL;
-	int i;
-	for (i = 0; i < 10000; ++i) {
-		int r = libusb_init(&ctx);
+	for (int i = 0; i < 10000; ++i) {
+		libusb_context *ctx = NULL;
+		int r;
+
+		r = libusb_init(&ctx);
 		if (r != LIBUSB_SUCCESS) {
-			libusb_testlib_logf(tctx,
+			libusb_testlib_logf(
 				"Failed to init libusb on iteration %d: %d",
 				i, r);
 			return TEST_STATUS_FAILURE;
 		}
 		libusb_exit(ctx);
-		ctx = NULL;
 	}
 
 	return TEST_STATUS_SUCCESS;
 }
 
 /** Tests that devices can be listed 1000 times. */
-static libusb_testlib_result test_get_device_list(libusb_testlib_ctx * tctx)
+static libusb_testlib_result test_get_device_list(void)
 {
-	libusb_context * ctx = NULL;
-	int r, i;
+	libusb_context *ctx;
+	int r;
+
 	r = libusb_init(&ctx);
 	if (r != LIBUSB_SUCCESS) {
-		libusb_testlib_logf(tctx, "Failed to init libusb: %d", r);
+		libusb_testlib_logf("Failed to init libusb: %d", r);
 		return TEST_STATUS_FAILURE;
 	}
-	for (i = 0; i < 1000; ++i) {
-		libusb_device ** device_list;
+
+	for (int i = 0; i < 1000; ++i) {
+		libusb_device **device_list = NULL;
 		ssize_t list_size = libusb_get_device_list(ctx, &device_list);
-		if (list_size < 0 || device_list == NULL) {
-			libusb_testlib_logf(tctx,
-				"Failed to get device list on iteration %d: %d (%p)",
-				i, -list_size, device_list);
+		if (list_size < 0 || !device_list) {
+			libusb_testlib_logf(
+				"Failed to get device list on iteration %d: %ld (%p)",
+				i, (long)-list_size, device_list);
+			libusb_exit(ctx);
 			return TEST_STATUS_FAILURE;
 		}
 		libusb_free_device_list(device_list, 1);
 	}
+
 	libusb_exit(ctx);
 	return TEST_STATUS_SUCCESS;
 }
 
 /** Tests that 100 concurrent device lists can be open at a time. */
-static libusb_testlib_result test_many_device_lists(libusb_testlib_ctx * tctx)
+static libusb_testlib_result test_many_device_lists(void)
 {
 #define LIST_COUNT 100
-	libusb_context * ctx = NULL;
-	libusb_device ** device_lists[LIST_COUNT];
-	int r, i;
-	memset(device_lists, 0, sizeof(device_lists));
+	libusb_testlib_result result = TEST_STATUS_SUCCESS;
+	libusb_context *ctx = NULL;
+	libusb_device **device_lists[LIST_COUNT];
+	int r;
 
 	r = libusb_init(&ctx);
 	if (r != LIBUSB_SUCCESS) {
-		libusb_testlib_logf(tctx, "Failed to init libusb: %d", r);
+		libusb_testlib_logf("Failed to init libusb: %d", r);
 		return TEST_STATUS_FAILURE;
 	}
 
+	memset(device_lists, 0, sizeof(device_lists));
+
 	/* Create the 100 device lists. */
-	for (i = 0; i < LIST_COUNT; ++i) {
-		ssize_t list_size = libusb_get_device_list(ctx, &(device_lists[i]));
-		if (list_size < 0 || device_lists[i] == NULL) {
-			libusb_testlib_logf(tctx,
-				"Failed to get device list on iteration %d: %d (%p)",
-				i, -list_size, device_lists[i]);
-			return TEST_STATUS_FAILURE;
+	for (int i = 0; i < LIST_COUNT; ++i) {
+		ssize_t list_size = libusb_get_device_list(ctx, &device_lists[i]);
+		if (list_size < 0 || !device_lists[i]) {
+			libusb_testlib_logf(
+				"Failed to get device list on iteration %d: %ld (%p)",
+				i, (long)-list_size, device_lists[i]);
+			result = TEST_STATUS_FAILURE;
+			break;
 		}
 	}
 
 	/* Destroy the 100 device lists. */
-	for (i = 0; i < LIST_COUNT; ++i) {
-		if (device_lists[i]) {
+	for (int i = 0; i < LIST_COUNT; ++i) {
+		if (device_lists[i])
 			libusb_free_device_list(device_lists[i], 1);
-			device_lists[i] = NULL;
-		}
 	}
 
 	libusb_exit(ctx);
-	return TEST_STATUS_SUCCESS;
+	return result;
 #undef LIST_COUNT
 }
 
 /** Tests that the default context (used for various things including
  * logging) works correctly when the first context created in a
  * process is destroyed. */
-static libusb_testlib_result test_default_context_change(libusb_testlib_ctx * tctx)
+static libusb_testlib_result test_default_context_change(void)
 {
-	libusb_context * ctx = NULL;
-	int r, i;
+	for (int i = 0; i < 100; ++i) {
+		libusb_context *ctx = NULL;
+		int r;
 
-	for (i = 0; i < 100; ++i) {
 		/* First create a new context */
 		r = libusb_init(&ctx);
 		if (r != LIBUSB_SUCCESS) {
-			libusb_testlib_logf(tctx, "Failed to init libusb: %d", r);
+			libusb_testlib_logf("Failed to init libusb: %d", r);
 			return TEST_STATUS_FAILURE;
 		}
 
-		/* Enable debug output, to be sure to use the context */
-		libusb_set_option(NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG);
+		/* Enable debug output on new context, to be sure to use the context */
 		libusb_set_option(ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG);
 
+		/* Enable debug output on the default context. This should work even before
+		 * the context has been created. */
+		libusb_set_option(NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG);
+
 		/* Now create a reference to the default context */
 		r = libusb_init(NULL);
 		if (r != LIBUSB_SUCCESS) {
-			libusb_testlib_logf(tctx, "Failed to init libusb: %d", r);
+			libusb_testlib_logf("Failed to init libusb: %d", r);
+			libusb_exit(ctx);
 			return TEST_STATUS_FAILURE;
 		}
 
@@ -147,14 +156,14 @@ static libusb_testlib_result test_default_context_change(libusb_testlib_ctx * tc
 
 /* Fill in the list of tests. */
 static const libusb_testlib_test tests[] = {
-	{"init_and_exit", &test_init_and_exit},
-	{"get_device_list", &test_get_device_list},
-	{"many_device_lists", &test_many_device_lists},
-	{"default_context_change", &test_default_context_change},
+	{ "init_and_exit", &test_init_and_exit },
+	{ "get_device_list", &test_get_device_list },
+	{ "many_device_lists", &test_many_device_lists },
+	{ "default_context_change", &test_default_context_change },
 	LIBUSB_NULL_TEST
 };
 
-int main (int argc, char ** argv)
+int main(int argc, char *argv[])
 {
 	return libusb_testlib_run_tests(argc, argv, tests);
 }