zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jlink: add usb location support 

this patch needs latest extended libjaylink version

Change-Id: Ib688ba18740717ccce7863e08c09425975b5f153
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/4596
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
bscan_optimization
Oleksij Rempel 2018-07-04 16:40:58 +02:00 committed by Tomas Vanek
parent 9655da5aed
commit 85ed41d210
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/jtag/drivers/jlink.c
View File

@ -38,6 +38,7 @@
#include <jtag/interface.h> #include <jtag/interface.h>
#include <jtag/swd.h> #include <jtag/swd.h>
#include <jtag/commands.h> #include <jtag/commands.h>
#include <jtag/drivers/jtag_usb_common.h>
#include <libjaylink/libjaylink.h> #include <libjaylink/libjaylink.h>
@ -50,6 +51,7 @@ static uint8_t caps[JAYLINK_DEV_EXT_CAPS_SIZE];
static uint32_t serial_number; static uint32_t serial_number;
static bool use_serial_number; static bool use_serial_number;
static bool use_usb_location;
static enum jaylink_usb_address usb_address; static enum jaylink_usb_address usb_address;
static bool use_usb_address; static bool use_usb_address;
static enum jaylink_target_interface iface = JAYLINK_TIF_JTAG; static enum jaylink_target_interface iface = JAYLINK_TIF_JTAG;
@ -534,6 +536,31 @@ static int jaylink_log_handler(const struct jaylink_context *ctx,
return 0; return 0;
} }
static bool jlink_usb_location_equal(struct jaylink_device *dev)
{
int retval;
uint8_t bus;
uint8_t *ports;
size_t num_ports;
bool equal = false;
retval = jaylink_device_get_usb_bus_ports(dev, &bus, &ports, &num_ports);
if (retval == JAYLINK_ERR_NOT_SUPPORTED) {
return false;
} else if (retval != JAYLINK_OK) {
LOG_WARNING("jaylink_device_get_usb_bus_ports() failed: %s.",
jaylink_strerror(retval));
return false;
}
equal = jtag_usb_location_equal(bus, ports, num_ports);
free(ports);
return equal;
}
static int jlink_init(void) static int jlink_init(void)
{ {
int ret; int ret;
@ -595,7 +622,9 @@ static int jlink_init(void)
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
} }
if (!use_serial_number && !use_usb_address && num_devices > 1) { use_usb_location = (jtag_usb_get_location() != NULL);
if (!use_serial_number && !use_usb_address && !use_usb_location && num_devices > 1) {
LOG_ERROR("Multiple devices found, specify the desired device."); LOG_ERROR("Multiple devices found, specify the desired device.");
jaylink_free_devices(devs, true); jaylink_free_devices(devs, true);
jaylink_exit(jayctx); jaylink_exit(jayctx);
@ -605,8 +634,10 @@ static int jlink_init(void)
found_device = false; found_device = false;
for (i = 0; devs[i]; i++) { for (i = 0; devs[i]; i++) {
struct jaylink_device *dev = devs[i];
if (use_serial_number) { if (use_serial_number) {
ret = jaylink_device_get_serial_number(devs[i], &tmp); ret = jaylink_device_get_serial_number(dev, &tmp);
if (ret == JAYLINK_ERR_NOT_AVAILABLE) { if (ret == JAYLINK_ERR_NOT_AVAILABLE) {
continue; continue;
@ -621,7 +652,7 @@ static int jlink_init(void)
} }
if (use_usb_address) { if (use_usb_address) {
ret = jaylink_device_get_usb_address(devs[i], &address); ret = jaylink_device_get_usb_address(dev, &address);
if (ret == JAYLINK_ERR_NOT_SUPPORTED) { if (ret == JAYLINK_ERR_NOT_SUPPORTED) {
continue; continue;
@ -635,7 +666,10 @@ static int jlink_init(void)
continue; continue;
} }
ret = jaylink_open(devs[i], &devh); if (use_usb_location && !jlink_usb_location_equal(dev))
continue;
ret = jaylink_open(dev, &devh);
if (ret == JAYLINK_OK) { if (ret == JAYLINK_OK) {
found_device = true; found_device = true;