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

scpi: Disable scpi_usbtmc in favor of scpi_usbtmc_libusb for now. 

Having both in the list will "find" the same device twice.
This commit is contained in:
Uwe Hermann 2014-02-07 19:01:45 +01:00
parent 2a0f6924d2
commit ed840c8612
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hardware/common/scpi.c
View File

@ -68,7 +68,7 @@ static int parse_strict_bool(const char *str, gboolean *ret)
SR_PRIV extern const struct sr_scpi_dev_inst scpi_serial_dev; SR_PRIV extern const struct sr_scpi_dev_inst scpi_serial_dev;
SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_raw_dev; SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_raw_dev;
SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_rigol_dev; SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_rigol_dev;
SR_PRIV extern const struct sr_scpi_dev_inst scpi_usbtmc_dev; /* SR_PRIV extern const struct sr_scpi_dev_inst scpi_usbtmc_dev; */
SR_PRIV extern const struct sr_scpi_dev_inst scpi_usbtmc_libusb_dev; SR_PRIV extern const struct sr_scpi_dev_inst scpi_usbtmc_libusb_dev;
SR_PRIV extern const struct sr_scpi_dev_inst scpi_vxi_dev; SR_PRIV extern const struct sr_scpi_dev_inst scpi_vxi_dev;
SR_PRIV extern const struct sr_scpi_dev_inst scpi_visa_dev; SR_PRIV extern const struct sr_scpi_dev_inst scpi_visa_dev;
@ -76,7 +76,7 @@ SR_PRIV extern const struct sr_scpi_dev_inst scpi_visa_dev;
static const struct sr_scpi_dev_inst *scpi_devs[] = { static const struct sr_scpi_dev_inst *scpi_devs[] = {
&scpi_tcp_raw_dev, &scpi_tcp_raw_dev,
&scpi_tcp_rigol_dev, &scpi_tcp_rigol_dev,
&scpi_usbtmc_dev, /* &scpi_usbtmc_dev, */
#ifdef HAVE_LIBUSB_1_0 #ifdef HAVE_LIBUSB_1_0
&scpi_usbtmc_libusb_dev, &scpi_usbtmc_libusb_dev,
#endif #endif