No need to check return value of libusb_get_device_descriptor().

[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 b7892436899aad14f54be6515c1f0d958157b69d..d54ea40c7e2d5dd31ccb3441b42b092e98f206b1 100644 (file)
--- a/src/scpi/scpi_usbtmc_libusb.c
+++ b/src/scpi/scpi_usbtmc_libusb.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
@@ -69,6 +70,9 @@ enum {
        LOCAL_LOCKOUT               = 162,
 };
 
+/* USBTMC status codes */
+#define USBTMC_STATUS_SUCCESS      0x01
+
 /* USBTMC capabilities */
 #define USBTMC_INT_CAP_LISTEN_ONLY 0x01
 #define USBTMC_INT_CAP_TALK_ONLY   0x02
@@ -110,11 +114,7 @@ static GSList *scpi_usbtmc_libusb_scan(struct drv_context *drvc)
                return NULL;
        }
        for (i = 0; devlist[i]; i++) {
-               if ((ret = libusb_get_device_descriptor(devlist[i], &des)) < 0) {
-                       sr_err("Failed to get device descriptor: %s.",
-                              libusb_error_name(ret));
-                       continue;
-               }
+               libusb_get_device_descriptor(devlist[i], &des);
 
                for (confidx = 0; confidx < des.bNumConfigurations; confidx++) {
                        if ((ret = libusb_get_config_descriptor(devlist[i], confidx, &confdes)) < 0) {
@@ -184,7 +184,7 @@ static int scpi_usbtmc_libusb_open(void *priv)
        const struct libusb_interface_descriptor *intfdes;
        const struct libusb_endpoint_descriptor *ep;
        int confidx, intfidx, epidx, config = 0;
-       uint8_t capabilities[24];
+       uint8_t capabilities[24], status;
        int ret, found = 0;
 
        if (usb->devhdl)
@@ -194,11 +194,7 @@ static int scpi_usbtmc_libusb_open(void *priv)
                return SR_ERR;
 
        dev = libusb_get_device(usb->devhdl);
-       if ((ret = libusb_get_device_descriptor(dev, &des)) < 0) {
-               sr_err("Failed to get device descriptor: %s.",
-                      libusb_error_name(ret));
-               return SR_ERR;
-       }
+       libusb_get_device_descriptor(dev, &des);
 
        for (confidx = 0; confidx < des.bNumConfigurations; confidx++) {
                if ((ret = libusb_get_config_descriptor(dev, confidx, &confdes)) < 0) {
@@ -312,6 +308,32 @@ static int scpi_usbtmc_libusb_open(void *priv)
               uscpi->usb488_dev_cap & USB488_DEV_CAP_RL1        ? "RL1"  : "RL0",
               uscpi->usb488_dev_cap & USB488_DEV_CAP_DT1        ? "DT1"  : "DT0");
 
+       if (uscpi->usb488_dev_cap & USB488_DEV_CAP_RL1) {
+               sr_dbg("Locking out local control.");
+               ret = libusb_control_transfer(usb->devhdl,
+                               LIBUSB_ENDPOINT_IN         |
+                               LIBUSB_REQUEST_TYPE_CLASS  |
+                               LIBUSB_RECIPIENT_INTERFACE,
+                               REN_CONTROL, 1,
+                               uscpi->interface,
+                               &status, 1,
+                               TRANSFER_TIMEOUT);
+               if (ret < 0 || status != USBTMC_STATUS_SUCCESS) {
+                       sr_dbg("Failed to enter REN state.");
+                       return SR_OK;
+               }
+               ret = libusb_control_transfer(usb->devhdl,
+                               LIBUSB_ENDPOINT_IN         |
+                               LIBUSB_REQUEST_TYPE_CLASS  |
+                               LIBUSB_RECIPIENT_INTERFACE,
+                               LOCAL_LOCKOUT, 1,
+                               uscpi->interface,
+                               &status, 1,
+                               TRANSFER_TIMEOUT);
+               if (ret < 0 || status != USBTMC_STATUS_SUCCESS)
+                       sr_dbg("Failed to enter local lockout state.");
+       }
+
        return SR_OK;
 }
 
@@ -526,6 +548,7 @@ static int scpi_usbtmc_libusb_close(void *priv)
        int ret;
        struct scpi_usbtmc_libusb *uscpi = priv;
        struct sr_usb_dev_inst *usb = uscpi->usb;
+       uint8_t status;
 
        if (!usb->devhdl)
                return SR_ERR;
@@ -542,6 +565,20 @@ static int scpi_usbtmc_libusb_close(void *priv)
                       uscpi->interrupt_ep, libusb_error_name(ret));
        }
 
+       if (uscpi->usb488_dev_cap & USB488_DEV_CAP_RL1) {
+               sr_dbg("Returning local control.");
+               ret = libusb_control_transfer(usb->devhdl,
+                               LIBUSB_ENDPOINT_IN         |
+                               LIBUSB_REQUEST_TYPE_CLASS  |
+                               LIBUSB_RECIPIENT_INTERFACE,
+                               GO_TO_LOCAL, 1,
+                               uscpi->interface,
+                               &status, 1,
+                               TRANSFER_TIMEOUT);
+               if (ret < 0 || status != USBTMC_STATUS_SUCCESS)
+                       sr_dbg("Failed to clear local lockout state.");
+       }
+
        if ((ret = libusb_release_interface(usb->devhdl, uscpi->interface)) < 0)
                sr_err("Failed to release interface: %s.",
                       libusb_error_name(ret));