imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jtag/drivers/cmsis-dap-usb: fix cmsis_dap_serial 

Previously the serial wasn't actually used in hid_open() call,
which meant that the first device with matching vid:pid was opened
irrespective of the actual serial number.

Change-Id: I45216ae5d9e0798e97be693c30e2f03c89b9a02b
Signed-off-by: Jaakko Kukkohovi <jkukkohovi@gmail.com>
Reviewed-on: http://openocd.zylin.com/2487
Tested-by: jenkins
Reviewed-by: Jörg Wunsch <openocd@uriah.heep.sax.de>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
This commit is contained in:
Jaakko Kukkohovi 2015-01-21 16:16:31 +02:00 committed by Spencer Oliver
parent 101124c69a
commit fe04314c2a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,8 +163,10 @@ static int cmsis_dap_usb_open(void)
int i;
struct hid_device_info *devs, *cur_dev;
unsigned short target_vid, target_pid;
wchar_t *target_serial = NULL;
bool found = false;
bool serial_found = false;
target_vid = 0;
target_pid = 0;
@ -204,8 +206,10 @@ static int cmsis_dap_usb_open(void)
/* we have found an adapter, so exit further checks */
/* check serial number matches if given */
if (cmsis_dap_serial != NULL) {
if (wcscmp(cmsis_dap_serial, cur_dev->serial_number) == 0)
if (wcscmp(cmsis_dap_serial, cur_dev->serial_number) == 0) {
serial_found = true;
break;
}
} else
break;
}
@ -216,6 +220,8 @@ static int cmsis_dap_usb_open(void)
if (NULL != cur_dev) {
target_vid = cur_dev->vendor_id;
target_pid = cur_dev->product_id;
if (serial_found)
target_serial = cmsis_dap_serial;
}
hid_free_enumeration(devs);
@ -230,7 +236,7 @@ static int cmsis_dap_usb_open(void)
return ERROR_FAIL;
}
dev = hid_open(target_vid, target_pid, NULL);
dev = hid_open(target_vid, target_pid, target_serial);
if (dev == NULL) {
LOG_ERROR("unable to open CMSIS-DAP device");