interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmsis-dap: Fix CMSIS-DAP serial number processing. 

Check CMSIS-DAP adapter has serialnumber before pass it to wcscmp.
Keep looking for onother adapter if choosed one doesn't have correct
serialnumber.

Change-Id: I7d386a03cb49b9baf22073ae1c6b14269ed3b618
Signed-off-by: Andrii Anpilogov <anpilog@gmail.com>
Reviewed-on: http://openocd.zylin.com/3226
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
This commit is contained in:
anpilog 2016-01-29 17:20:20 +08:00 committed by Andreas Fritiofson
parent cf88f4e283
commit 8cf5e04c73
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jtag/drivers/cmsis_dap_usb.c
View File

@ -214,12 +214,14 @@ static int cmsis_dap_usb_open(void)
/* we have found an adapter, so exit further checks */ /* we have found an adapter, so exit further checks */
/* check serial number matches if given */ /* check serial number matches if given */
if (cmsis_dap_serial != NULL) { if (cmsis_dap_serial != NULL) {
if (wcscmp(cmsis_dap_serial, cur_dev->serial_number) == 0) { if ((cur_dev->serial_number != NULL) && wcscmp(cmsis_dap_serial, cur_dev->serial_number) == 0) {
serial_found = true; serial_found = true;
break; break;
} }
} else } else
break; break;
found = false;
} }
cur_dev = cur_dev->next; cur_dev = cur_dev->next;