From: Stefan Brüns <redacted>
Date: Sat, 16 Apr 2016 21:37:40 +0000 (+0200)
Subject: scpi/usbtmc: fix remote locking according to USBTMC spec
X-Git-Tag: libsigrok-0.5.0~507
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=66836720f73c12fb107aa28b79cc6420c721cc5d;p=libsigrok.git

scpi/usbtmc: fix remote locking according to USBTMC spec

According to USBTMC usb488 subclass spec, wValue hast to be 0 for both
LOCAL_LOCKOUT and GO_TO_LOCAL. At least required for R&S HMO1002, the
bad request results in a STALL. Fixes bug #783.
---

diff --git a/src/scpi/scpi_usbtmc_libusb.c b/src/scpi/scpi_usbtmc_libusb.c
index 3dd622a2..6e472750 100644
--- a/src/scpi/scpi_usbtmc_libusb.c
+++ b/src/scpi/scpi_usbtmc_libusb.c
@@ -238,7 +238,7 @@ static int scpi_usbtmc_remote(struct scpi_usbtmc_libusb *uscpi)
 			LIBUSB_ENDPOINT_IN         |
 			LIBUSB_REQUEST_TYPE_CLASS  |
 			LIBUSB_RECIPIENT_INTERFACE,
-			LOCAL_LOCKOUT, 1,
+			LOCAL_LOCKOUT, 0,
 			uscpi->interface,
 			&status, 1,
 			TRANSFER_TIMEOUT);
@@ -276,7 +276,7 @@ static void scpi_usbtmc_local(struct scpi_usbtmc_libusb *uscpi)
 			LIBUSB_ENDPOINT_IN         |
 			LIBUSB_REQUEST_TYPE_CLASS  |
 			LIBUSB_RECIPIENT_INTERFACE,
-			GO_TO_LOCAL, 1,
+			GO_TO_LOCAL, 0,
 			uscpi->interface,
 			&status, 1,
 			TRANSFER_TIMEOUT);