From: Aurelien Jacobs <redacted>
Date: Tue, 22 Sep 2015 22:24:54 +0000 (+0200)
Subject: scpi_usbtmc_libusb: add Rigol DS2000 to the RL1 blacklist
X-Git-Tag: libsigrok-0.4.0~193
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e40e9ca28d81d5ac43e1cb306390cfb7463b89e8;p=libsigrok.git

scpi_usbtmc_libusb: add Rigol DS2000 to the RL1 blacklist

The Rigol DS2000 series also give a USB timeout when trying to apply
RL1 lock or unlock.
---

diff --git a/src/scpi/scpi_usbtmc_libusb.c b/src/scpi/scpi_usbtmc_libusb.c
index cd9ade47..0b14cb3f 100644
--- a/src/scpi/scpi_usbtmc_libusb.c
+++ b/src/scpi/scpi_usbtmc_libusb.c
@@ -101,11 +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 },
-	/* Agilent DSO1000 series are rebadged versions of the Rigol DS1000. */
-	{ 0x0957, 0x0588 },
+	{ 0x1ab1, 0x0588 },  /* Rigol DS1000 series */
+	{ 0x1ab1, 0x04b0 },  /* Rigol DS2000 series */
+	{ 0x0957, 0x0588 },  /* Agilent DSO1000 series (rebadged Rigol DS1000) */
 	ALL_ZERO
 };