This is an automated email from Gerrit.
Paul Fertser (fercer...@gmail.com) just uploaded a new patch set to Gerrit,
which you can find at http://openocd.zylin.com/2445
-- gerrit
commit f3bfdc34f4c776a0dddbec9a4bf5363a86efa6d4
Author: Łukasz Misek <lukasz-mi...@users.sf.net>
Date: Tue Jan 6 15:53:09 2015 +0300
jtag/drivers/ulink: auto-detect OpenULINK USB endpoints numbers
This should provide greater compatibility with different OpenULINK
targets which might be using various endpoints numbers. Since they're
advertised in the USB descriptor anyway it makes sense to autodetect
them.
Interface is no longer claimed before attempting to load firmware to a
freshly booted device, so I have no idea if this will break on windows
or other uncommon systems (Paul).
Change-Id: Iee10dcb6911dcf46239c430e174d9f98b5bde3c2
Signed-off-by: Paul Fertser <fercer...@gmail.com>
diff --git a/src/jtag/drivers/ulink.c b/src/jtag/drivers/ulink.c
index 8c2b9db..656c959 100644
--- a/src/jtag/drivers/ulink.c
+++ b/src/jtag/drivers/ulink.c
@@ -27,6 +27,7 @@
#include <jtag/commands.h>
#include <target/image.h>
#include <libusb.h>
+#include "libusb_common.h"
#include "OpenULINK/include/msgtypes.h"
/** USB Vendor ID of ULINK device in unconfigured state (no firmware loaded
@@ -150,6 +151,9 @@ struct ulink {
struct libusb_device_handle *usb_device_handle;
enum ulink_type type;
+ uint ep_in; /**< IN endpoint number */
+ uint ep_out; /**< OUT endpoint number */
+
int delay_scan_in; /**< Delay value for SCAN_IN commands */
int delay_scan_out; /**< Delay value for SCAN_OUT commands */
int delay_scan_io; /**< Delay value for SCAN_IO commands */
@@ -257,7 +261,7 @@ struct ulink *ulink_handle;
/**************************** USB helper functions
****************************/
/**
- * Opens the ULINK device and claims its USB interface.
+ * Opens the ULINK device
*
* Currently, only the original ULINK is supported
*
@@ -295,9 +299,6 @@ int ulink_usb_open(struct ulink **device)
return ERROR_FAIL;
libusb_free_device_list(usb_devices, 1);
- if (libusb_claim_interface(usb_device_handle, 0) != 0)
- return ERROR_FAIL;
-
(*device)->usb_device_handle = usb_device_handle;
(*device)->type = ULINK_1;
@@ -735,7 +736,7 @@ int ulink_execute_queued_commands(struct ulink *device, int
timeout)
}
/* Send packet to ULINK */
- ret = libusb_bulk_transfer(device->usb_device_handle, (2 |
LIBUSB_ENDPOINT_OUT),
+ ret = libusb_bulk_transfer(device->usb_device_handle, device->ep_out,
(unsigned char *)buffer, count_out, &transferred,
timeout);
if (ret != 0)
return ERROR_FAIL;
@@ -744,7 +745,7 @@ int ulink_execute_queued_commands(struct ulink *device, int
timeout)
/* Wait for response if commands contain IN payload data */
if (count_in > 0) {
- ret = libusb_bulk_transfer(device->usb_device_handle, (2 |
LIBUSB_ENDPOINT_IN),
+ ret = libusb_bulk_transfer(device->usb_device_handle,
device->ep_in,
(unsigned char *)buffer, 64, &transferred,
timeout);
if (ret != 0)
return ERROR_FAIL;
@@ -2203,6 +2204,12 @@ static int ulink_init(void)
} else
LOG_INFO("ULINK device is already running OpenULINK firmware");
+ /* Get OpenULINK USB IN/OUT endpoints and claim the interface */
+ ret = jtag_libusb_choose_interface(ulink_handle->usb_device_handle,
+ &ulink_handle->ep_in, &ulink_handle->ep_out, -1, -1, -1);
+ if (ret != ERROR_OK)
+ return ret;
+
/* Initialize OpenULINK command queue */
ulink_clear_queue(ulink_handle);
@@ -2218,7 +2225,7 @@ static int ulink_init(void)
* shut down by the user via Ctrl-C. Try to retrieve this Bulk
IN packet. */
dummy = calloc(64, sizeof(uint8_t));
- ret = libusb_bulk_transfer(ulink_handle->usb_device_handle, (2
| LIBUSB_ENDPOINT_IN),
+ ret = libusb_bulk_transfer(ulink_handle->usb_device_handle,
ulink_handle->ep_in,
dummy, 64, &transferred, 200);
free(dummy);
--
------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
