From c0f5e58acb316010015e28104c425cda7e8e1c78 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Sun, 18 May 2014 19:49:51 +0100
Subject: samples: set xusb to also produce debug output during init when -d is
 specified

* This can be quite useful for troubleshooting user issues
---
 examples/xusb.c       | 23 +++++++++++++++++++++--
 libusb/version_nano.h |  2 +-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/examples/xusb.c b/examples/xusb.c
index 540c90e..f7549ca 100644
--- a/examples/xusb.c
+++ b/examples/xusb.c
@@ -33,6 +33,11 @@
 #define msleep(msecs) usleep(1000*msecs)
 #endif
 
+#if defined(_MSC_VER)
+#define snprintf _snprintf
+#define putenv _putenv
+#endif
+
 #if !defined(bool)
 #define bool int
 #endif
@@ -973,7 +978,7 @@ int main(int argc, char** argv)
 	size_t i, arglen;
 	unsigned tmp_vid, tmp_pid;
 	uint16_t endian_test = 0xBE00;
-	char* error_lang = NULL;
+	char *error_lang = NULL, *old_dbg_str = NULL, str[256];
 
 	// Default to generic, expecting VID:PID
 	VID = 0;
@@ -1089,13 +1094,22 @@ int main(int argc, char** argv)
 		return 0;
 	}
 
+	// xusb is commonly used as a debug tool, so it's convenient to have debug output during libusb_init(),
+	// but since we can't call on libusb_set_debug() before libusb_init(), we use the env variable method
+	old_dbg_str = getenv("LIBUSB_DEBUG");
+	if (debug_mode) {
+		putenv("LIBUSB_DEBUG=4");	// LIBUSB_LOG_LEVEL_DEBUG
+	}
+
 	version = libusb_get_version();
 	printf("Using libusb v%d.%d.%d.%d\n\n", version->major, version->minor, version->micro, version->nano);
 	r = libusb_init(NULL);
 	if (r < 0)
 		return r;
 
-	libusb_set_debug(NULL, debug_mode?LIBUSB_LOG_LEVEL_DEBUG:LIBUSB_LOG_LEVEL_INFO);
+	// If not set externally, and no debug option was given, use info log level
+	if ((old_dbg_str == NULL) && (!debug_mode))
+		libusb_set_debug(NULL, LIBUSB_LOG_LEVEL_INFO);
 	if (error_lang != NULL) {
 		r = libusb_setlocale(error_lang);
 		if (r < 0)
@@ -1106,5 +1120,10 @@ int main(int argc, char** argv)
 
 	libusb_exit(NULL);
 
+	if (debug_mode) {
+		snprintf(str, sizeof(str), "LIBUSB_DEBUG=%s", (old_dbg_str == NULL)?"":old_dbg_str);
+		str[sizeof(str) - 1] = 0;	// Windows may not NUL terminate the string
+	}
+
 	return 0;
 }
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 350a2d4..94ac72a 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10888
+#define LIBUSB_NANO 10889
-- 
cgit v1.2.1