This is an automated email from Gerrit. Antonio Borneo ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/4700
-- gerrit commit 9c56c4c4d875cf61195db53cf6f0685c2edbd602 Author: Antonio Borneo <[email protected]> Date: Mon Oct 8 17:41:06 2018 +0200 jtag/drivers/openjtag: fix build with libusb0 The build of openjtag with libusb0 is allowed, but it fails. Fix the code to be compatible with libusb0. Change-Id: I827b77eac10216759eb31aab461b2b63cabaf195 Signed-off-by: Antonio Borneo <[email protected]> diff --git a/src/jtag/drivers/openjtag.c b/src/jtag/drivers/openjtag.c index 8f11b4b..a9458eb 100644 --- a/src/jtag/drivers/openjtag.c +++ b/src/jtag/drivers/openjtag.c @@ -457,9 +457,15 @@ static int openjtag_init_cy7c65215(void) goto err; } +#ifdef HAVE_LIBUSB1 ret = jtag_libusb_choose_interface(usbh, &ep_in, &ep_out, CY7C65215_JTAG_CLASS, CY7C65215_JTAG_SUBCLASS, -1, LIBUSB_TRANSFER_TYPE_BULK); +#else + ret = jtag_libusb_choose_interface(usbh, &ep_in, &ep_out, + CY7C65215_JTAG_CLASS, + CY7C65215_JTAG_SUBCLASS, -1, USB_ENDPOINT_TYPE_BULK); +#endif if (ret != ERROR_OK) { LOG_ERROR("unable to claim JTAG interface"); goto err; -- _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
