X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fscpi_usbtmc_libusb.c;h=c814ba167945135377dae85fab6490078a68ae44;hb=1458018224d98bfc080c571e2145f816afbcac39;hp=c38845439fd04c901a32a482010622490a1a2f91;hpb=d8cbd659ce2e24428c7e403eeebd50ad4a992caa;p=libsigrok.git

diff --git a/hardware/common/scpi_usbtmc_libusb.c b/hardware/common/scpi_usbtmc_libusb.c
index c3884543..c814ba16 100644
--- a/hardware/common/scpi_usbtmc_libusb.c
+++ b/hardware/common/scpi_usbtmc_libusb.c
@@ -43,6 +43,7 @@ struct scpi_usbtmc_libusb {
 	int response_length;
 	int response_bytes_read;
 	int remaining_length;
+	int rigol_ds1000;
 };
 
 /* Some USBTMC-specific enums, as defined in the USBTMC standard. */
@@ -116,9 +117,9 @@ static GSList *scpi_usbtmc_libusb_scan(struct drv_context *drvc)
 		}
 
 		for (confidx = 0; confidx < des.bNumConfigurations; confidx++) {
-			if (libusb_get_config_descriptor(devlist[i], confidx, &confdes) < 0) {
-				sr_err("Failed to get configuration descriptor: %s.",
-				       libusb_error_name(ret));
+			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));
 				break;
 			}
 			for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) {
@@ -200,9 +201,9 @@ static int scpi_usbtmc_libusb_open(void *priv)
 	}
 
 	for (confidx = 0; confidx < des.bNumConfigurations; confidx++) {
-		if (libusb_get_config_descriptor(dev, confidx, &confdes) < 0) {
-			sr_err("Failed to get configuration descriptor: %s.",
-			       libusb_error_name(ret));
+		if ((ret = libusb_get_config_descriptor(dev, confidx, &confdes)) < 0) {
+			sr_dbg("Failed to get configuration descriptor: %s, "
+			       "ignoring device.", libusb_error_name(ret));
 			continue;
 		}
 		for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) {
@@ -234,6 +235,8 @@ static int scpi_usbtmc_libusb_open(void *priv)
 				}
 			}
 			found = 1;
+			uscpi->rigol_ds1000 = des.idVendor  == 0x1ab1 &&
+			                      des.idProduct == 0x0588;
 		}
 		libusb_free_config_descriptor(confdes);
 		if (found)
@@ -267,6 +270,7 @@ static int scpi_usbtmc_libusb_open(void *priv)
 		return SR_ERR;
 	}
 
+	if (!uscpi->rigol_ds1000) {
 	if ((ret = libusb_clear_halt(usb->devhdl, uscpi->bulk_in_ep)) < 0) {
 		sr_err("Failed to clear halt/stall condition for EP %d: %s.",
 		       uscpi->bulk_in_ep, libusb_error_name(ret));
@@ -282,6 +286,7 @@ static int scpi_usbtmc_libusb_open(void *priv)
 		       uscpi->interrupt_ep, libusb_error_name(ret));
 		return SR_ERR;
 	}
+	}
 
 	/* Get capabilities. */
 	ret = libusb_control_transfer(usb->devhdl,
@@ -524,6 +529,7 @@ static int scpi_usbtmc_libusb_close(void *priv)
 	if (!usb->devhdl)
 		return SR_ERR;
 
+	if (!uscpi->rigol_ds1000) {
 	if ((ret = libusb_clear_halt(usb->devhdl, uscpi->bulk_in_ep)) < 0)
 		sr_err("Failed to clear halt/stall condition for EP %d: %s.",
 		       uscpi->bulk_in_ep, libusb_error_name(ret));
@@ -533,6 +539,7 @@ static int scpi_usbtmc_libusb_close(void *priv)
 	if ((ret = libusb_clear_halt(usb->devhdl, uscpi->interrupt_ep)) < 0)
 		sr_err("Failed to clear halt/stall condition for EP %d: %s.",
 		       uscpi->interrupt_ep, libusb_error_name(ret));
+	}
 
 	if ((ret = libusb_release_interface(usb->devhdl, uscpi->interface)) < 0)
 		sr_err("Failed to release interface: %s.",