aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-05-31 21:06:46 -0700
committerTomas Vanek <vanekt@fbl.cz>2018-06-05 12:36:53 +0100
commitebf2d733409e140cb220d95eb3a915fed14d69a4 (patch)
treeea96cc2625fe7b36421e0b8a7ed196041bb29c82
parent95a0024ef2e16c2bca592ce20c0fe00154b1aaa5 (diff)
downloadriscv-openocd-ebf2d733409e140cb220d95eb3a915fed14d69a4.zip
riscv-openocd-ebf2d733409e140cb220d95eb3a915fed14d69a4.tar.gz
riscv-openocd-ebf2d733409e140cb220d95eb3a915fed14d69a4.tar.bz2
Fix libusb-1.0.22 deprecated libusb_set_debug with libusb_set_option
libusb_set_debug is deprecated in libusb >= 1.0.22 therefore replace with equivalent libusb_set_option() API Change-Id: Ic0287a1bc0ccc90afe8e4c688085f0b25a7fb004 Signed-off-by: Khem Raj <raj.khem@gmail.com> Reviewed-on: http://openocd.zylin.com/4540 Tested-by: jenkins Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com> Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
-rw-r--r--src/jtag/drivers/xds110.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/jtag/drivers/xds110.c b/src/jtag/drivers/xds110.c
index 90b6990..9bfe02e 100644
--- a/src/jtag/drivers/xds110.c
+++ b/src/jtag/drivers/xds110.c
@@ -367,8 +367,11 @@ static bool usb_connect(void)
/* Set libusb to auto detach kernel and disable debug messages */
(void)libusb_set_auto_detach_kernel_driver(dev, 1);
+#if LIBUSB_API_VERSION >= 0x01000106
+ libusb_set_option(ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE);
+#else
libusb_set_debug(ctx, LIBUSB_LOG_LEVEL_NONE);
-
+#endif
/* Claim the debug interface on the XDS110 */
result = libusb_claim_interface(dev, INTERFACE_DEBUG);
} else {