BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

usbtmc: Silence some overly verbose log messages. 

These trigger quite often with unrelated devices and confuse people.

  scpi_usbtmc: Failed to get configuration descriptor: LIBUSB_ERROR_NOT_FOUND, ignoring device.
This commit is contained in:
Uwe Hermann 2018-04-08 19:47:00 +02:00
parent 66d2cc3a27
commit 23d68466f8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/scpi/scpi_usbtmc_libusb.c
View File

@ -138,8 +138,9 @@ static GSList *scpi_usbtmc_libusb_scan(struct drv_context *drvc)
for (confidx = 0; confidx < des.bNumConfigurations; confidx++) { for (confidx = 0; confidx < des.bNumConfigurations; confidx++) {
if ((ret = libusb_get_config_descriptor(devlist[i], confidx, &confdes)) < 0) { if ((ret = libusb_get_config_descriptor(devlist[i], confidx, &confdes)) < 0) {
sr_dbg("Failed to get configuration descriptor: %s, " if (ret != LIBUSB_ERROR_NOT_FOUND)
"ignoring device.", libusb_error_name(ret)); sr_dbg("Failed to get configuration descriptor: %s, "
"ignoring device.", libusb_error_name(ret));
break; break;
} }
for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) { for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) {
@ -310,8 +311,9 @@ static int scpi_usbtmc_libusb_open(struct sr_scpi_dev_inst *scpi)
for (confidx = 0; confidx < des.bNumConfigurations; confidx++) { for (confidx = 0; confidx < des.bNumConfigurations; confidx++) {
if ((ret = libusb_get_config_descriptor(dev, confidx, &confdes)) < 0) { if ((ret = libusb_get_config_descriptor(dev, confidx, &confdes)) < 0) {
sr_dbg("Failed to get configuration descriptor: %s, " if (ret != LIBUSB_ERROR_NOT_FOUND)
"ignoring device.", libusb_error_name(ret)); sr_dbg("Failed to get configuration descriptor: %s, "
"ignoring device.", libusb_error_name(ret));
continue; continue;
} }
for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) { for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) {