BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SCPI: Do not use RL1 lockout for Yokogawa devices

This commit is contained in:
Soeren Apel 2016-01-29 21:59:06 +01:00
parent b18b8a9202
commit a084a8f2a4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/scpi/scpi_usbtmc_libusb.c
View File

@ -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;
}