[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1202-g38d205ecc

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  38d205ecc5335191214dbd0f714f4561a7b7b746 (commit)
      from  86cf8d9fb0e9ef29d69b97d30aa5670814e00a24 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 38d205ecc5335191214dbd0f714f4561a7b7b746
Author: Leonard Crestez <leo...@nx...>
Date:   Thu Feb 6 16:13:25 2020 +0200

    ftdi: Report an error if no ftdi_vid_pid is specified
    
    By default the list of VID/PID is empty so if ftdi_vid_pid is not called
    then no matches are attempted. The only message is at -d3:
    
            Command 'init' failed with error code -100"
    
    Check for this condition explicitly to make life easier for people
    configuring adapters.
    
    Change-Id: If0f93370c9e9ddc9700aae7c346c1c6dd319152e
    Signed-off-by: Leonard Crestez <leo...@nx...>
    Reviewed-on: http://openocd.zylin.com/5440
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index 121cb469f..f1d28d2fd 100644
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -647,6 +647,11 @@ static int ftdi_initialize(void)
 	else
 		LOG_DEBUG("ftdi interface using shortest path jtag state transitions");
 
+	if (!ftdi_vid[0] && !ftdi_pid[0]) {
+		LOG_ERROR("Please specify ftdi_vid_pid");
+		return ERROR_JTAG_INIT_FAILED;
+	}
+
 	for (int i = 0; ftdi_vid[i] || ftdi_pid[i]; i++) {
 		mpsse_ctx = mpsse_open(&ftdi_vid[i], &ftdi_pid[i], ftdi_device_desc,
 				ftdi_serial, jtag_usb_get_location(), ftdi_channel);

-----------------------------------------------------------------------

Summary of changes:
 src/jtag/drivers/ftdi.c | 5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository