diff options
| author | Paul Fertser <fercerpav@gmail.com> | 2014-06-24 18:10:35 +0400 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2014-07-03 18:40:49 +0000 |
| commit | aa79f7b7e0124f993da379690f3b629ef6d76c6c (patch) | |
| tree | 19f3d9158685e97dcc384d5c7b581c1fa7c56d27 /src | |
| parent | a74b5687a7195a6d816a251df59af21acf05aae6 (diff) | |
jtag/drivers/cmsis_dap: fix check for hardcoded vids/pids
This is intended to fix cmsis_dap_vid_pid command but it doesn't
because cmsis-dap has only one transport and it's auto-selected from
"interface" command handler (before any other commands are run) and as
the result cmsis_dap_usb_open() is called too early.
Change-Id: Idaade73797d8df67a6439d096f6abc9736495599
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2191
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/jtag/drivers/cmsis_dap_usb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/jtag/drivers/cmsis_dap_usb.c b/src/jtag/drivers/cmsis_dap_usb.c index 5072de0c..7d4c579a 100644 --- a/src/jtag/drivers/cmsis_dap_usb.c +++ b/src/jtag/drivers/cmsis_dap_usb.c @@ -193,6 +193,8 @@ static int cmsis_dap_usb_open(void) if ((cmsis_dap_vid[i] == cur_dev->vendor_id) && (cmsis_dap_pid[i] == cur_dev->product_id)) break; } + if (cmsis_dap_vid[i] || cmsis_dap_pid[i]) + break; } cur_dev = cur_dev->next; |