X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_usbtmc_libusb.c;h=dc17c8722b44c00100ffa4a700e1769bd6787205;hb=9e850040db5c6628e7d1f5a797d75f6bc8de7ea8;hp=decafdb62af3c44b0635853d751694d0fb29eef8;hpb=d9251a2c9f1ca4380c27240ccca90c9f9ed46d3f;p=libsigrok.git

diff --git a/src/scpi/scpi_usbtmc_libusb.c b/src/scpi/scpi_usbtmc_libusb.c
index decafdb6..dc17c872 100644
--- a/src/scpi/scpi_usbtmc_libusb.c
+++ b/src/scpi/scpi_usbtmc_libusb.c
@@ -107,6 +107,13 @@ static struct usbtmc_blacklist blacklist_remote[] = {
 	{ 0x1ab1, 0x04b0 }, /* Rigol DS2000 series */
 	{ 0x0957, 0x0588 }, /* Agilent DSO1000 series (rebadged Rigol DS1000) */
 	{ 0x0b21, 0xffff }, /* All Yokogawa devices */
+	{ 0xf4ec, 0xffff }, /* All Siglent SDS devices */
+	ALL_ZERO
+};
+
+/* Devices that shall get reset during open(). */
+static struct usbtmc_blacklist whitelist_usb_reset[] = {
+	{ 0xf4ec, 0xffff }, /* All Siglent SDS devices */
 	ALL_ZERO
 };
 
@@ -131,8 +138,9 @@ static GSList *scpi_usbtmc_libusb_scan(struct drv_context *drvc)
 
 		for (confidx = 0; confidx < des.bNumConfigurations; confidx++) {
 			if ((ret = libusb_get_config_descriptor(devlist[i], confidx, &confdes)) < 0) {
-				sr_dbg("Failed to get configuration descriptor: %s, "
-				       "ignoring device.", libusb_error_name(ret));
+				if (ret != LIBUSB_ERROR_NOT_FOUND)
+					sr_dbg("Failed to get configuration descriptor: %s, "
+					       "ignoring device.", libusb_error_name(ret));
 				break;
 			}
 			for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) {
@@ -155,7 +163,7 @@ static GSList *scpi_usbtmc_libusb_scan(struct drv_context *drvc)
 	}
 	libusb_free_device_list(devlist, 1);
 
-	sr_dbg("Found %d device(s).", g_slist_length(resources));
+	/* No log message for #devices found (caller will log that). */
 
 	return resources;
 }
@@ -290,6 +298,7 @@ static int scpi_usbtmc_libusb_open(struct sr_scpi_dev_inst *scpi)
 	int confidx, intfidx, epidx, config = 0, current_config;
 	uint8_t capabilities[24];
 	int ret, found = 0;
+	int do_reset;
 
 	if (usb->devhdl)
 		return SR_OK;
@@ -302,8 +311,9 @@ static int scpi_usbtmc_libusb_open(struct sr_scpi_dev_inst *scpi)
 
 	for (confidx = 0; confidx < des.bNumConfigurations; confidx++) {
 		if ((ret = libusb_get_config_descriptor(dev, confidx, &confdes)) < 0) {
-			sr_dbg("Failed to get configuration descriptor: %s, "
-			       "ignoring device.", libusb_error_name(ret));
+			if (ret != LIBUSB_ERROR_NOT_FOUND)
+				sr_dbg("Failed to get configuration descriptor: %s, "
+				       "ignoring device.", libusb_error_name(ret));
 			continue;
 		}
 		for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) {
@@ -370,6 +380,12 @@ static int scpi_usbtmc_libusb_open(struct sr_scpi_dev_inst *scpi)
 		return SR_ERR;
 	}
 
+	/* Optionally reset the USB device. */
+	do_reset = check_usbtmc_blacklist(whitelist_usb_reset,
+		des.idVendor, des.idProduct);
+	if (do_reset)
+		libusb_reset_device(usb->devhdl);
+
 	/* Get capabilities. */
 	ret = libusb_control_transfer(usb->devhdl, LIBUSB_ENDPOINT_IN |
 		LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE,
@@ -617,7 +633,7 @@ static int scpi_usbtmc_libusb_close(struct sr_scpi_dev_inst *scpi)
 	if ((ret = libusb_release_interface(usb->devhdl, uscpi->interface)) < 0)
 		sr_err("Failed to release interface: %s.",
 		       libusb_error_name(ret));
-	
+
 	if (uscpi->detached_kernel_driver) {
 		if ((ret = libusb_attach_kernel_driver(usb->devhdl,
 						uscpi->interface)) < 0)