Constify a lot more items.

[libsigrok.git] / src / scpi / scpi_usbtmc_libusb.c

diff --git a/src/scpi/scpi_usbtmc_libusb.c b/src/scpi/scpi_usbtmc_libusb.c
index 0b14cb3f89da912e8eecf039cc83c62384f79ce9..9f49dd1d2ea8ec2e8f2fd7446b4df1852eb232c0 100644 (file)
--- a/src/scpi/scpi_usbtmc_libusb.c
+++ b/src/scpi/scpi_usbtmc_libusb.c
@@ -299,7 +299,7 @@ static int scpi_usbtmc_libusb_open(struct sr_scpi_dev_inst *scpi)
        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;
 
@@ -367,10 +367,13 @@ static int scpi_usbtmc_libusb_open(struct sr_scpi_dev_inst *scpi)
                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) {
@@ -619,26 +622,11 @@ static int scpi_usbtmc_libusb_close(struct sr_scpi_dev_inst *scpi)
 {
        struct scpi_usbtmc_libusb *uscpi = scpi->priv;
        struct sr_usb_dev_inst *usb = uscpi->usb;
-       struct libusb_device *dev;
-       struct libusb_device_descriptor des;
        int ret;
 
        if (!usb->devhdl)
                return SR_ERR;
 
-       dev = libusb_get_device(usb->devhdl);
-       libusb_get_device_descriptor(dev, &des);
-       if (des.idVendor == 0x1ab1 && des.idProduct == 0x0588
-                       && scpi->firmware_version >= 24) {
-               /* Rigol DS1000 with firmware > 0.2.4 needs this. */
-               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_out_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));
-       }
-
        scpi_usbtmc_local(uscpi);
 
        if ((ret = libusb_release_interface(usb->devhdl, uscpi->interface)) < 0)