diff options
| author | Marc Schink <openocd-dev@marcschink.de> | 2017-09-02 10:16:41 +0200 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2017-10-03 11:19:10 +0100 |
| commit | b0dcff5e345cf255d0ccdc5b473dff408af4b5ed (patch) | |
| tree | 0e7d74d9f06bbd165246885afbe42d11d7963b24 /src/jtag/drivers | |
| parent | 98e63cdc86243cf91fc0da56479acef240313d19 (diff) | |
| download | riscv-openocd-b0dcff5e345cf255d0ccdc5b473dff408af4b5ed.zip riscv-openocd-b0dcff5e345cf255d0ccdc5b473dff408af4b5ed.tar.gz riscv-openocd-b0dcff5e345cf255d0ccdc5b473dff408af4b5ed.tar.bz2 | |
jlink: Disable TCP/IP discovery
If no serial number is specified, disable TCP/IP device discovery to
ensure that a user does not unintentionally operate on a remote device.
Change-Id: I6a7e913b8b679fae003825468cd86d2014849b29
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/4214
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/jtag/drivers')
| -rw-r--r-- | src/jtag/drivers/jlink.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c index ac6e997..132ef06 100644 --- a/src/jtag/drivers/jlink.c +++ b/src/jtag/drivers/jlink.c @@ -547,6 +547,7 @@ static int jlink_init(void) enum jaylink_usb_address address; size_t length; size_t num_devices; + uint32_t host_interfaces; LOG_DEBUG("Using libjaylink %s (compiled with %s).", jaylink_version_package_get_string(), JAYLINK_VERSION_PACKAGE_STRING); @@ -572,7 +573,12 @@ static int jlink_init(void) return ERROR_JTAG_INIT_FAILED; } - ret = jaylink_discovery_scan(jayctx, 0); + host_interfaces = JAYLINK_HIF_USB; + + if (use_serial_number) + host_interfaces |= JAYLINK_HIF_TCP; + + ret = jaylink_discovery_scan(jayctx, host_interfaces); if (ret != JAYLINK_OK) { LOG_ERROR("jaylink_discovery_scan() failed: %s.", |