Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed st-info --probe mechanism #918

Merged
merged 7 commits into from
Apr 10, 2020
Merged

Fixed st-info --probe mechanism #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
90081dd
usb.h: define some stlink usb pid macros, stop copypasting.
grevaillot Apr 10, 2020
8fba7ab
usb.c: align probe code.
grevaillot Apr 10, 2020
6b03c7f
usb.c: rework probe loop to _not_ free all stuff without closing if _…
grevaillot Apr 10, 2020
aff1df2
stlink_probe_usb_devs: return number of successfully opened devices, …
grevaillot Apr 10, 2020
512999d
stlink_open_usb: use macros for stlink pid filtering
grevaillot Apr 10, 2020
395eee5
stlink_open_usb: fix serial lookup mecanism when a v1 device is conne…
grevaillot Apr 10, 2020
cec61aa
stlink_open_usb: remove wrong comment, we do handle protocoll (?) v1 …
grevaillot Apr 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions include/stlink/usb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,24 @@ extern "C" {
#define STLINK_USB_PID_STLINK_V3S_PID 0x374f
#define STLINK_USB_PID_STLINK_V3_2VCP_PID 0x3753

#define STLINK_V1_USB_PID(pid) ((pid) == STLINK_USB_PID_STLINK )

#define STLINK_V2_USB_PID(pid) ((pid) == STLINK_USB_PID_STLINK_32L || \
(pid) == STLINK_USB_PID_STLINK_32L_AUDIO || \
(pid) == STLINK_USB_PID_STLINK_NUCLEO)

#define STLINK_V2_1_USB_PID(pid) ( (pid) == STLINK_USB_PID_STLINK_V2_1 )

#define STLINK_V3_USB_PID(pid) ((pid) == STLINK_USB_PID_STLINK_V3_USBLOADER || \
(pid) == STLINK_USB_PID_STLINK_V3E_PID || \
(pid) == STLINK_USB_PID_STLINK_V3S_PID || \
(pid) == STLINK_USB_PID_STLINK_V3_2VCP_PID )

#define STLINK_SUPPORTED_USB_PID(pid) ( STLINK_V1_USB_PID(pid) || \
STLINK_V2_USB_PID(pid) || \
STLINK_V2_1_USB_PID(pid) || \
STLINK_V3_USB_PID(pid))

#define STLINK_SG_SIZE 31
#define STLINK_CMD_SIZE 16

Expand Down
142 changes: 56 additions & 86 deletions src/usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,8 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, bool reset, char serial[ST
}

while (cnt--) {
struct libusb_device_handle *handle;

libusb_get_device_descriptor( list[cnt], &desc );
if (desc.idVendor != STLINK_USB_VID_ST)
continue;
Expand All @@ -937,63 +939,44 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, bool reset, char serial[ST
}
}

if ((desc.idProduct == STLINK_USB_PID_STLINK_32L) ||
(desc.idProduct == STLINK_USB_PID_STLINK_NUCLEO) ||
(desc.idProduct == STLINK_USB_PID_STLINK_32L_AUDIO) ||
(desc.idProduct == STLINK_USB_PID_STLINK_V2_1) ||
(desc.idProduct == STLINK_USB_PID_STLINK_V3_USBLOADER) ||
(desc.idProduct == STLINK_USB_PID_STLINK_V3E_PID) ||
(desc.idProduct == STLINK_USB_PID_STLINK_V3S_PID) ||
(desc.idProduct == STLINK_USB_PID_STLINK_V3_2VCP_PID)) {
struct libusb_device_handle *handle;

ret = libusb_open(list[cnt], &handle);
if (ret)
continue;
ret = libusb_open(list[cnt], &handle);

sl->serial_size = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber,
(unsigned char *)sl->serial, sizeof(sl->serial));
libusb_close(handle);

if ((desc.idProduct == STLINK_USB_PID_STLINK_32L)
|| (desc.idProduct == STLINK_USB_PID_STLINK_NUCLEO)
|| (desc.idProduct == STLINK_USB_PID_STLINK_32L_AUDIO)
|| (desc.idProduct == STLINK_USB_PID_STLINK_V2_1)) {
sl->version.stlink_v = 2;
} else if ((desc.idProduct == STLINK_USB_PID_STLINK_V3_USBLOADER)
|| (desc.idProduct == STLINK_USB_PID_STLINK_V3E_PID)
|| (desc.idProduct == STLINK_USB_PID_STLINK_V3S_PID)
|| (desc.idProduct == STLINK_USB_PID_STLINK_V3_2VCP_PID)) {
sl->version.stlink_v = 3;
}
/* could not open device, continue */
if (ret)
continue;

if ((serial == NULL) || (*serial == 0))
break;
sl->serial_size = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber,
(unsigned char *)sl->serial, sizeof(sl->serial));

if (sl->serial_size < 0)
continue;
libusb_close(handle);

if (memcmp(serial, &sl->serial, sl->serial_size) == 0)
break;
/* could not read serial, continue */
if (sl->serial_size < 0)
continue;

continue;
}
/* if no serial provided, or if serial match device, fixup version and protocol */
if (((serial == NULL) || (*serial == 0)) || (memcmp(serial, &sl->serial, sl->serial_size) == 0)) {
if (STLINK_V1_USB_PID(desc.idProduct)) {
slu->protocoll = 1;
sl->version.stlink_v = 1;
} else if (STLINK_V2_USB_PID(desc.idProduct) || STLINK_V2_1_USB_PID(desc.idProduct)) {
sl->version.stlink_v = 2;
} else if (STLINK_V3_USB_PID(desc.idProduct)) {
sl->version.stlink_v = 3;
}

if (desc.idProduct == STLINK_USB_PID_STLINK) {
slu->protocoll = 1;
sl->version.stlink_v = 1;
break;
}
break;
}
}

if (cnt < 0) {
WLOG ("Couldn't find %s ST-Link/V2 devices\n",(devBus && devAddr)?"matched":"any");
WLOG ("Couldn't find %s ST-Link devices\n", (devBus && devAddr) ? "matched":"any");
goto on_error;
} else {
ret = libusb_open(list[cnt], &slu->usb_handle);
if (ret != 0) {
WLOG("Error %d (%s) opening ST-Link/V2 device %03d:%03d\n",
ret, strerror (errno), libusb_get_bus_number(list[cnt]), libusb_get_device_address(list[cnt]));
WLOG("Error %d (%s) opening ST-Link v%d device %03d:%03d\n",
ret, strerror (errno), sl->version.stlink_v, libusb_get_bus_number(list[cnt]), libusb_get_device_address(list[cnt]));
libusb_free_device_list(list, 1);
goto on_error;
}
Expand Down Expand Up @@ -1044,8 +1027,7 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, bool reset, char serial[ST
}

slu->sg_transfer_idx = 0;
// TODO - never used at the moment, always CMD_SIZE
slu->cmd_len = (slu->protocoll == 1)? STLINK_SG_SIZE: STLINK_CMD_SIZE;
slu->cmd_len = (slu->protocoll == 1) ? STLINK_SG_SIZE: STLINK_CMD_SIZE;

// Initialize stlink version (sl->version)
stlink_version(sl);
Expand Down Expand Up @@ -1101,28 +1083,25 @@ static size_t stlink_probe_usb_devs(libusb_device **devs, stlink_t **sldevs[]) {
stlink_t **_sldevs;
libusb_device *dev;
int i = 0;
int ret = 0;
size_t slcnt = 0;
size_t slcur = 0;

/* Count stlink */
while ((dev = devs[i++]) != NULL) {
struct libusb_device_descriptor desc;
ret = libusb_get_device_descriptor(dev, &desc);
int ret = libusb_get_device_descriptor(dev, &desc);
if (ret < 0) {
WLOG("failed to get libusb device descriptor (libusb error: %d)\n", ret);
break;
}

if (desc.idProduct != STLINK_USB_PID_STLINK_32L &&
desc.idProduct != STLINK_USB_PID_STLINK_32L_AUDIO &&
desc.idProduct != STLINK_USB_PID_STLINK_NUCLEO &&
desc.idProduct != STLINK_USB_PID_STLINK_V2_1 &&
desc.idProduct != STLINK_USB_PID_STLINK_V3_USBLOADER &&
desc.idProduct != STLINK_USB_PID_STLINK_V3E_PID &&
desc.idProduct != STLINK_USB_PID_STLINK_V3S_PID &&
desc.idProduct != STLINK_USB_PID_STLINK_V3_2VCP_PID)
continue;
if (desc.idVendor != STLINK_USB_VID_ST)
continue;

if (!STLINK_SUPPORTED_USB_PID(desc.idProduct)) {
WLOG("skipping ST device : %#04x:%#04x)\n", desc.idVendor, desc.idProduct);
continue;
}

slcnt++;
}
Expand All @@ -1138,55 +1117,46 @@ static size_t stlink_probe_usb_devs(libusb_device **devs, stlink_t **sldevs[]) {
i = 0;
while ((dev = devs[i++]) != NULL) {
struct libusb_device_descriptor desc;
ret = libusb_get_device_descriptor(dev, &desc);
int ret = libusb_get_device_descriptor(dev, &desc);
if (ret < 0) {
WLOG("failed to get libusb device descriptor (libusb error: %d)\n", ret);
break;
}

if (desc.idProduct != STLINK_USB_PID_STLINK_32L &&
desc.idProduct != STLINK_USB_PID_STLINK_32L_AUDIO &&
desc.idProduct != STLINK_USB_PID_STLINK_NUCLEO)
if (!STLINK_SUPPORTED_USB_PID(desc.idProduct)) {
continue;
}

struct libusb_device_handle* handle;
char serial[STLINK_SERIAL_MAX_SIZE];
memset(serial, 0, sizeof(serial));
struct libusb_device_handle* handle;
char serial[STLINK_SERIAL_MAX_SIZE] = {0,};

ret = libusb_open(dev, &handle);
if (ret < 0) {
if (ret == LIBUSB_ERROR_ACCESS) {
ret = libusb_open(dev, &handle);
if (ret < 0) {
if (ret == LIBUSB_ERROR_ACCESS) {
WLOG("failed to open USB device (LIBUSB_ERROR_ACCESS), try running as root?\n");
} else {
WLOG("failed to open USB device (libusb error: %d)\n", ret);
}
break;
}
}
break;
}

ret = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, (unsigned char *)&serial, sizeof(serial));

ret = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, (unsigned char *)&serial, sizeof(serial));
if (ret < 0)
*serial = 0;
libusb_close(handle);

libusb_close(handle);
if (ret < 0) {
continue;
}

stlink_t *sl = NULL;
sl = stlink_open_usb(0, 1, serial);
stlink_t *sl = stlink_open_usb(0, 1, serial);
if (!sl)
continue;

_sldevs[slcur] = sl;
slcur++;
}

/* Something went wrong */
if (ret < 0) {
free(_sldevs);
*sldevs = NULL;
return 0;
_sldevs[slcur++] = sl;
}

*sldevs = _sldevs;
return slcnt;
return slcur;
}

size_t stlink_probe_usb(stlink_t **stdevs[]) {
Expand Down