sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hosted/ftdi: Compare only for length of the string given in the header 

Devices may have added version like "Tigard V1.1" vs "Tigard"
This commit is contained in:
Uwe Bonnes 2021-05-16 23:06:04 +02:00 committed by UweBonnes
parent c3fd198f0d
commit cb4cff2c71
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platforms/hosted/bmp_libusb.c
View File

@ -253,13 +253,13 @@ int find_debuggers(BMP_CL_OPTIONS_t *cl_opts,bmp_info_t *info)
if ((cable->vendor != desc.idVendor) || (cable->product != desc.idProduct)) if ((cable->vendor != desc.idVendor) || (cable->product != desc.idProduct))
continue; /* VID/PID do not match*/ continue; /* VID/PID do not match*/
if (cl_opts->opt_cable) { if (cl_opts->opt_cable) {
if (strcmp(cable->name, cl_opts->opt_cable)) if (strncmp(cable->name, cl_opts->opt_cable, strlen(cable->name)))
continue; /* cable names do not match*/ continue; /* cable names do not match*/
else else
found = true; found = true;
} }
if (cable->description) { if (cable->description) {
if (strcmp(cable->description, product)) if (strncmp(cable->description, product, strlen(cable->description)))
continue; /* discriptions do not match*/ continue; /* discriptions do not match*/
else else
found = true; found = true;

4
src/platforms/hosted/ftdi_bmp.c
View File

@ -269,7 +269,7 @@ int ftdi_bmp_init(BMP_CL_OPTIONS_t *cl_opts, bmp_info_t *info)
int err; int err;
cable_desc_t *cable = &cable_desc[0]; cable_desc_t *cable = &cable_desc[0];
for(; cable->name; cable++) { for(; cable->name; cable++) {
if (strcmp(cable->name, cl_opts->opt_cable) == 0) if (strncmp(cable->name, cl_opts->opt_cable, strlen(cable->name)) == 0)
break; break;
} }
@ -281,7 +281,7 @@ int ftdi_bmp_init(BMP_CL_OPTIONS_t *cl_opts, bmp_info_t *info)
active_cable = cable; active_cable = cable;
memcpy(&active_state, &active_cable->init, sizeof(data_desc_t)); memcpy(&active_state, &active_cable->init, sizeof(data_desc_t));
/* If swd_(read|write) is not given for the selected cable and /* If swd_(read|write) is not given for the selected cable and
the 'r' command line argument is give, assume resistor SWD the 'e' command line argument is give, assume resistor SWD
connection.*/ connection.*/
if (cl_opts->external_resistor_swd && if (cl_opts->external_resistor_swd &&
(active_cable->mpsse_swd_read.set_data_low == 0) && (active_cable->mpsse_swd_read.set_data_low == 0) &&