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

versaloon: Finish support for serial number matching

Browse Source 
Add a command to specify the serial string and pass it to the find helper.
Actual matching was already supported for both serial and product but was
using hard coded string indices. Instead use the indices from the device
descriptor.

Change-Id: I17c7538e5ad301ef41eace1ee70a202adab23bb4
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1816
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
This commit is contained in:
Andreas Fritiofson 2013-11-25 23:50:37 +01:00
parent 871b34cf2c
commit 255301fb50
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/jtag/drivers/vsllink.c
View File

@ -468,6 +468,21 @@ COMMAND_HANDLER(vsllink_handle_usb_pid_command)
return ERROR_OK; return ERROR_OK;
} }
COMMAND_HANDLER(vsllink_handle_usb_serial_command)
{
if (CMD_ARGC > 1)
return ERROR_COMMAND_SYNTAX_ERROR;
free(versaloon_interface.usb_setting.serialstring);
if (CMD_ARGC == 1)
versaloon_interface.usb_setting.serialstring = strdup(CMD_ARGV[0]);
else
versaloon_interface.usb_setting.serialstring = NULL;
return ERROR_OK;
}
COMMAND_HANDLER(vsllink_handle_usb_bulkin_command) COMMAND_HANDLER(vsllink_handle_usb_bulkin_command)
{ {
if (CMD_ARGC != 1) if (CMD_ARGC != 1)
@ -689,9 +704,8 @@ free_and_return:
return ret; return ret;
} }
static usb_dev_handle *find_usb_device(uint16_t VID, uint16_t PID, static usb_dev_handle *find_usb_device(uint16_t VID, uint16_t PID, uint8_t interface,
uint8_t interface, int8_t serialindex, char *serialstring, char *serialstring, char *productstring)
int8_t productindex, char *productstring)
{ {
usb_dev_handle *dev_handle = NULL; usb_dev_handle *dev_handle = NULL;
struct usb_bus *busses; struct usb_bus *busses;
@ -715,12 +729,10 @@ static usb_dev_handle *find_usb_device(uint16_t VID, uint16_t PID,
} }
/* check description string */ /* check description string */
if (((productstring != NULL) && (productindex >= 0) if ((productstring != NULL && !usb_check_string(dev_handle,
&& !usb_check_string(dev_handle, productindex, dev->descriptor.iProduct, productstring, NULL, 0))
productstring, NULL, 0)) || (serialstring != NULL && !usb_check_string(dev_handle,
|| ((serialstring != NULL) && (serialindex >= 0) dev->descriptor.iSerialNumber, serialstring, NULL, 0))) {
&& !usb_check_string(dev_handle, serialindex,
serialstring, NULL, 0))) {
usb_close(dev_handle); usb_close(dev_handle);
dev_handle = NULL; dev_handle = NULL;
continue; continue;
@ -752,7 +764,7 @@ static struct vsllink *vsllink_usb_open(void)
dev = find_usb_device(versaloon_interface.usb_setting.vid, dev = find_usb_device(versaloon_interface.usb_setting.vid,
versaloon_interface.usb_setting.pid, versaloon_interface.usb_setting.pid,
versaloon_interface.usb_setting.interface, versaloon_interface.usb_setting.interface,
0, NULL, 2, "Versaloon"); versaloon_interface.usb_setting.serialstring, "Versaloon");
if (NULL == dev) if (NULL == dev)
return NULL; return NULL;
@ -814,6 +826,11 @@ static const struct command_registration vsllink_command_handlers[] = {
.handler = &vsllink_handle_usb_pid_command, .handler = &vsllink_handle_usb_pid_command,
.mode = COMMAND_CONFIG, .mode = COMMAND_CONFIG,
}, },
{
.name = "vsllink_usb_serial",
.handler = &vsllink_handle_usb_serial_command,
.mode = COMMAND_CONFIG,
},
{ {
.name = "vsllink_usb_bulkin", .name = "vsllink_usb_bulkin",
.handler = &vsllink_handle_usb_bulkin_command, .handler = &vsllink_handle_usb_bulkin_command,