From: Soeren Apel <redacted>
Date: Fri, 29 Jan 2016 20:59:06 +0000 (+0100)
Subject: SCPI: Do not use RL1 lockout for Yokogawa devices
X-Git-Tag: libsigrok-0.4.0~4
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=a084a8f2a4fd5a48e659e36ae47bc393fd9d6ffc;p=libsigrok.git

SCPI: Do not use RL1 lockout for Yokogawa devices
---

diff --git a/src/scpi/scpi_usbtmc_libusb.c b/src/scpi/scpi_usbtmc_libusb.c
index 9f49dd1d..3dd622a2 100644
--- a/src/scpi/scpi_usbtmc_libusb.c
+++ b/src/scpi/scpi_usbtmc_libusb.c
@@ -106,6 +106,7 @@ static struct usbtmc_blacklist blacklist_remote[] = {
 	{ 0x1ab1, 0x0588 },  /* Rigol DS1000 series */
 	{ 0x1ab1, 0x04b0 },  /* Rigol DS2000 series */
 	{ 0x0957, 0x0588 },  /* Agilent DSO1000 series (rebadged Rigol DS1000) */
+	{ 0x0b21, 0xffff },  /* All Yokogawa devices */
 	ALL_ZERO
 };
 
@@ -192,7 +193,8 @@ static int check_usbtmc_blacklist(struct usbtmc_blacklist *blacklist,
 	int i;
 
 	for (i = 0; blacklist[i].vid; i++) {
-		if (blacklist[i].vid == vid && blacklist[i].pid == pid)
+		if ((blacklist[i].vid == vid && blacklist[i].pid == 0xFFFF) ||
+			(blacklist[i].vid == vid && blacklist[i].pid == pid))
 			return TRUE;
 	}