SWIG: Rename libsigrok.i to lowlevel.i.

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

diff --git a/hardware/common/scpi.c b/hardware/common/scpi.c
index 618ff058885ddb42b7b3661cbd4b6763f6e0e009..a3101a9c3a320057fa2068ae0bdac691057eb831 100644 (file)
--- a/hardware/common/scpi.c
+++ b/hardware/common/scpi.c
@@ -68,14 +68,16 @@ 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_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,
+#ifdef HAVE_LIBUSB_1_0
+       &scpi_usbtmc_libusb_dev,
+#endif
 #if HAVE_RPC
        &scpi_vxi_dev,
 #endif
@@ -213,7 +215,7 @@ SR_PRIV int sr_scpi_open(struct sr_scpi_dev_inst *scpi)
  *         SR_ERR_MALLOC upon memory allocation errors.
  */
 SR_PRIV int sr_scpi_source_add(struct sr_scpi_dev_inst *scpi, int events,
-               int timeout, sr_receive_data_callback_t cb, void *cb_data)
+               int timeout, sr_receive_data_callback cb, void *cb_data)
 {
        return scpi->source_add(scpi->priv, events, timeout, cb, cb_data);
 }