Add SR_CONF_DEVICE_MODE and SR_CONF_TEST_MODE config keys.

[libsigrok.git] / hardware / common / scpi.c

diff --git a/hardware/common/scpi.c b/hardware/common/scpi.c
index 618ff058885ddb42b7b3661cbd4b6763f6e0e009..3d99954b19b422f5cb78db0e8a737f23c0442861 100644 (file)
--- a/hardware/common/scpi.c
+++ b/hardware/common/scpi.c
@@ -68,14 +68,18 @@ 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;
 
 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
 #if HAVE_RPC
        &scpi_vxi_dev,
 #endif