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

pc-stlinkv2: Fix crash with serial given not matching connected devices.

This commit is contained in:
Uwe Bonnes 2019-08-31 09:57:32 +02:00
parent 052b5f830a
commit d994565f2e
1 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/platforms/pc-stlinkv2/stlinkv2.c
View File

@ -683,7 +683,7 @@ void stlink_init(int argc, char **argv)
goto error; goto error;
} }
int i = 0; int i = 0;
bool multiple_devices = false; int nr_stlinks = 0;
while ((dev = devs[i++]) != NULL) { while ((dev = devs[i++]) != NULL) {
struct libusb_device_descriptor desc; struct libusb_device_descriptor desc;
int r = libusb_get_device_descriptor(dev, &desc); int r = libusb_get_device_descriptor(dev, &desc);
@ -699,10 +699,6 @@ void stlink_init(int argc, char **argv)
DEBUG("STLINKV1 not supported\n"); DEBUG("STLINKV1 not supported\n");
continue; continue;
} }
if (Stlink.handle) {
libusb_close(Stlink.handle);
multiple_devices = (serial)? false : true;
}
r = libusb_open(dev, &Stlink.handle); r = libusb_open(dev, &Stlink.handle);
if (r == LIBUSB_SUCCESS) { if (r == LIBUSB_SUCCESS) {
uint8_t data[32]; uint8_t data[32];
@ -736,44 +732,50 @@ void stlink_init(int argc, char **argv)
} }
if (serial && (!strncmp(Stlink.serial, serial, strlen(serial)))) if (serial && (!strncmp(Stlink.serial, serial, strlen(serial))))
DEBUG("Found "); DEBUG("Found ");
if (!serial || (!strncmp(Stlink.serial, serial, strlen(serial)))) { if (desc.idProduct == PRODUCT_ID_STLINKV2) {
if (desc.idProduct == PRODUCT_ID_STLINKV2) { DEBUG("STLINKV20 serial %s\n", Stlink.serial);
DEBUG("STLINKV20 serial %s\n", Stlink.serial); Stlink.ver_hw = 20;
Stlink.ver_hw = 20; Stlink.ep_tx = 2;
Stlink.ep_tx = 2; } else if (desc.idProduct == PRODUCT_ID_STLINKV21) {
} else if (desc.idProduct == PRODUCT_ID_STLINKV21) { DEBUG("STLINKV21 serial %s\n", Stlink.serial);
DEBUG("STLINKV21 serial %s\n", Stlink.serial); Stlink.ver_hw = 21;
Stlink.ver_hw = 21; Stlink.ep_tx = 1;
Stlink.ep_tx = 1; } else if (desc.idProduct == PRODUCT_ID_STLINKV21_MSD) {
} else if (desc.idProduct == PRODUCT_ID_STLINKV21_MSD) { DEBUG("STLINKV21_MSD serial %s\n", Stlink.serial);
DEBUG("STLINKV21_MSD serial %s\n", Stlink.serial); Stlink.ver_hw = 21;
Stlink.ver_hw = 21; Stlink.ep_tx = 1;
Stlink.ep_tx = 1; } else if (desc.idProduct == PRODUCT_ID_STLINKV3E) {
} else if (desc.idProduct == PRODUCT_ID_STLINKV3E) { DEBUG("STLINKV3E serial %s\n", Stlink.serial);
DEBUG("STLINKV3E serial %s\n", Stlink.serial); Stlink.ver_hw = 30;
Stlink.ver_hw = 30; Stlink.ep_tx = 1;
Stlink.ep_tx = 1; } else if (desc.idProduct == PRODUCT_ID_STLINKV3) {
} else if (desc.idProduct == PRODUCT_ID_STLINKV3) { DEBUG("STLINKV3 serial %s\n", Stlink.serial);
DEBUG("STLINKV3 serial %s\n", Stlink.serial); Stlink.ver_hw = 30;
Stlink.ver_hw = 30; Stlink.ep_tx = 1;
Stlink.ep_tx = 1; } else {
DEBUG("Unknown STLINK variant, serial %s\n", Stlink.serial);
}
nr_stlinks++;
if (serial) {
if (!strncmp(Stlink.serial, serial, strlen(serial))) {
break;
} else { } else {
DEBUG("Unknown STLINK variant, serial %s\n", Stlink.serial); libusb_close(Stlink.handle);
Stlink.handle = 0;
} }
} }
if (serial && (!strncmp(Stlink.serial, serial, strlen(serial))))
break;
} else { } else {
DEBUG("Open failed %s\n", libusb_strerror(r)); DEBUG("Open failed %s\n", libusb_strerror(r));
} }
} }
} }
if (multiple_devices) {
DEBUG("Multiple Stlinks. Please specify serial number\n");
goto error_1;
}
if (!Stlink.handle) { if (!Stlink.handle) {
DEBUG("No Stlink device found!\n"); if (nr_stlinks && serial)
DEBUG("No Stlink with given serial number %s\n", serial);
else if (nr_stlinks > 1)
DEBUG("Multiple Stlinks. Please specify serial number\n");
else
DEBUG("No Stlink device found!\n");
goto error; goto error;
} }
int config; int config;