diff options
author | Austin Phillips <austin_phillips@hotmail.com> | 2014-09-18 14:39:41 +1000 |
---|---|---|
committer | Spencer Oliver <spen@spen-soft.co.uk> | 2014-09-22 19:36:05 +0000 |
commit | 7568a91c8e2398a113f0b40a2a24a1b91ed12c95 (patch) | |
tree | 0973e42dfc8bbf61eced6085c4a5e7765b4a54c7 /src/jtag/aice/aice_usb.c | |
parent | 3a4ec66b2427cd22b891a40dd63c778de28bb3c6 (diff) |
Support hla_serial command for ST-LINK adapters.
The hla_serial command allows for a programming device serial number to be
specified in addition to USB VID/PID. This allows for multiple ST-LINK/V2
programmers to be attached to a single machine and operated using openocd.
Change-Id: I350654bf676eb26ba3a90450acfa55d2a5d2d791
Signed-off-by: Austin Phillips <austin_phillips@hotmail.com>
Reviewed-on: http://openocd.zylin.com/2198
Tested-by: jenkins
Reviewed-by: Martin Glunz <mg@wunderkis.de>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/jtag/aice/aice_usb.c')
-rw-r--r-- | src/jtag/aice/aice_usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jtag/aice/aice_usb.c b/src/jtag/aice/aice_usb.c index 917d795b..d933845c 100644 --- a/src/jtag/aice/aice_usb.c +++ b/src/jtag/aice/aice_usb.c @@ -2099,7 +2099,7 @@ static int aice_usb_open(struct aice_port_param_s *param) const uint16_t pids[] = { param->pid, 0 }; struct jtag_libusb_device_handle *devh; - if (jtag_libusb_open(vids, pids, &devh) != ERROR_OK) + if (jtag_libusb_open(vids, pids, NULL, &devh) != ERROR_OK) return ERROR_FAIL; /* BE ***VERY CAREFUL*** ABOUT MAKING CHANGES IN THIS @@ -2123,7 +2123,7 @@ static int aice_usb_open(struct aice_port_param_s *param) /* reopen jlink after usb_reset * on win32 this may take a second or two to re-enumerate */ int retval; - while ((retval = jtag_libusb_open(vids, pids, &devh)) != ERROR_OK) { + while ((retval = jtag_libusb_open(vids, pids, NULL, &devh)) != ERROR_OK) { usleep(1000); timeout--; if (!timeout) |