scpi: Disable scpi_usbtmc in favor of scpi_usbtmc_libusb for now.

Having both in the list will "find" the same device twice.

diff --git a/hardware/common/scpi.c b/hardware/common/scpi.c
index 50fb94c4ae1cc2a4f1fc3f7092403eec94296176..3d99954b19b422f5cb78db0e8a737f23c0442861 100644 (file)
--- a/hardware/common/scpi.c
+++ b/hardware/common/scpi.c
@@ -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_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_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_vxi_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[] = {
        &scpi_tcp_raw_dev,
        &scpi_tcp_rigol_dev,
-       &scpi_usbtmc_dev,
+       /* &scpi_usbtmc_dev, */
 #ifdef HAVE_LIBUSB_1_0
        &scpi_usbtmc_libusb_dev,
 #endif