| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From b95a996bfb281104b68ec66f32ebb79db519a4a8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 31 May 2018 21:06:46 -0700 |
| 4 | Subject: [PATCH] Fix libusb-1.0.22 deprecated libusb_set_debug with |
| 5 | libusb_set_option |
| 6 | |
| 7 | libusb_set_debug is deprecated in libusb >= 1.0.22 therefore replace |
| 8 | with equivalent libusb_set_option() API |
| 9 | |
| 10 | see libusb commit for more details |
| 11 | |
| 12 | https://github.com/libusb/libusb/commit/539f22e2fd916558d11ab9a66f10f461c5593168 |
| 13 | |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 15 | --- |
| 16 | Upstream-Status: Submitted [http://openocd.zylin.com/#/c/4540/] |
| 17 | src/jtag/drivers/xds110.c | 5 ++++- |
| 18 | 1 file changed, 4 insertions(+), 1 deletion(-) |
| 19 | |
| 20 | diff --git a/src/jtag/drivers/xds110.c b/src/jtag/drivers/xds110.c |
| 21 | index 90b699027..9bfe02ea8 100644 |
| 22 | --- a/src/jtag/drivers/xds110.c |
| 23 | +++ b/src/jtag/drivers/xds110.c |
| 24 | @@ -367,8 +367,11 @@ static bool usb_connect(void) |
| 25 | |
| 26 | /* Set libusb to auto detach kernel and disable debug messages */ |
| 27 | (void)libusb_set_auto_detach_kernel_driver(dev, 1); |
| 28 | +#if LIBUSB_API_VERSION >= 0x01000106 |
| 29 | + libusb_set_option(ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE); |
| 30 | +#else |
| 31 | libusb_set_debug(ctx, LIBUSB_LOG_LEVEL_NONE); |
| 32 | - |
| 33 | +#endif |
| 34 | /* Claim the debug interface on the XDS110 */ |
| 35 | result = libusb_claim_interface(dev, INTERFACE_DEBUG); |
| 36 | } else { |
| 37 | -- |
| 38 | 2.17.1 |
| 39 | |