X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_usbtmc_libusb.c;h=9f49dd1d2ea8ec2e8f2fd7446b4df1852eb232c0;hb=2c24077466a299ead689c90f01f55f6d86c7386b;hp=95a283705fda036d9cdf719ccdf30162e0660774;hpb=115826529c6e7b69aff731c87e54ecb19cc2b649;p=libsigrok.git

diff --git a/src/scpi/scpi_usbtmc_libusb.c b/src/scpi/scpi_usbtmc_libusb.c
index 95a28370..9f49dd1d 100644
--- a/src/scpi/scpi_usbtmc_libusb.c
+++ b/src/scpi/scpi_usbtmc_libusb.c
@@ -45,7 +45,6 @@ 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. */
@@ -102,9 +101,11 @@ struct usbtmc_blacklist {
 	uint16_t pid;
 };
 
+/* Devices that publish RL1 support, but don't support it. */
 static struct usbtmc_blacklist blacklist_remote[] = {
-	/* Rigol DS1000 series publishes RL1 support, but doesn't support it. */
-	{ 0x1ab1, 0x0588 },
+	{ 0x1ab1, 0x0588 },  /* Rigol DS1000 series */
+	{ 0x1ab1, 0x04b0 },  /* Rigol DS2000 series */
+	{ 0x0957, 0x0588 },  /* Agilent DSO1000 series (rebadged Rigol DS1000) */
 	ALL_ZERO
 };
 
@@ -289,16 +290,16 @@ static void scpi_usbtmc_local(struct scpi_usbtmc_libusb *uscpi)
 	return;
 }
 
-static int scpi_usbtmc_libusb_open(void *priv)
+static int scpi_usbtmc_libusb_open(struct sr_scpi_dev_inst *scpi)
 {
-	struct scpi_usbtmc_libusb *uscpi = priv;
+	struct scpi_usbtmc_libusb *uscpi = scpi->priv;
 	struct sr_usb_dev_inst *usb = uscpi->usb;
 	struct libusb_device *dev;
 	struct libusb_device_descriptor des;
 	struct libusb_config_descriptor *confdes;
 	const struct libusb_interface_descriptor *intfdes;
 	const struct libusb_endpoint_descriptor *ep;
-	int confidx, intfidx, epidx, config = 0;
+	int confidx, intfidx, epidx, config = 0, current_config;
 	uint8_t capabilities[24];
 	int ret, found = 0;
 
@@ -345,8 +346,6 @@ 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)
@@ -368,10 +367,13 @@ static int scpi_usbtmc_libusb_open(void *priv)
 		uscpi->detached_kernel_driver = 1;
 	}
 
-	if ((ret = libusb_set_configuration(usb->devhdl, config)) < 0) {
-		sr_err("Failed to set configuration: %s.",
-		       libusb_error_name(ret));
-		return SR_ERR;
+	if (libusb_get_configuration(usb->devhdl, &current_config) == 0
+	    && current_config != config) {
+		if ((ret = libusb_set_configuration(usb->devhdl, config)) < 0) {
+			sr_err("Failed to set configuration: %s.",
+			       libusb_error_name(ret));
+			return SR_ERR;
+		}
 	}
 
 	if ((ret = libusb_claim_interface(usb->devhdl, uscpi->interface)) < 0) {
@@ -380,24 +382,6 @@ 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));
-		return SR_ERR;
-	}
-	if ((ret = libusb_clear_halt(usb->devhdl, uscpi->bulk_out_ep)) < 0) {
-		sr_err("Failed to clear halt/stall condition for EP %d: %s.",
-		       uscpi->bulk_out_ep, libusb_error_name(ret));
-		return SR_ERR;
-	}
-	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));
-		return SR_ERR;
-	}
-	}
-
 	/* Get capabilities. */
 	ret = libusb_control_transfer(usb->devhdl,
 	                              LIBUSB_ENDPOINT_IN         |
@@ -634,27 +618,15 @@ static int scpi_usbtmc_libusb_read_complete(void *priv)
 	       uscpi->bulkin_attributes & EOM;
 }
 
-static int scpi_usbtmc_libusb_close(void *priv)
+static int scpi_usbtmc_libusb_close(struct sr_scpi_dev_inst *scpi)
 {
-	int ret;
-	struct scpi_usbtmc_libusb *uscpi = priv;
+	struct scpi_usbtmc_libusb *uscpi = scpi->priv;
 	struct sr_usb_dev_inst *usb = uscpi->usb;
+	int ret;
 
 	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));
-	if ((ret = libusb_clear_halt(usb->devhdl, uscpi->bulk_out_ep)) < 0)
-		sr_err("Failed to clear halt/stall condition for EP %d: %s.",
-		       uscpi->bulk_out_ep, libusb_error_name(ret));
-	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));
-	}
-
 	scpi_usbtmc_local(uscpi);
 
 	if ((ret = libusb_release_interface(usb->devhdl, uscpi->interface)) < 0)