X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fscpi.c;h=3d99954b19b422f5cb78db0e8a737f23c0442861;hb=831d7c70eb901788d6fa7551807644b1130cce32;hp=618ff058885ddb42b7b3661cbd4b6763f6e0e009;hpb=b541f8376d8fadb1377e3140c3d79304f5d680ec;p=libsigrok.git diff --git a/hardware/common/scpi.c b/hardware/common/scpi.c index 618ff058..3d99954b 100644 --- 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