X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fscpi.c;h=a3101a9c3a320057fa2068ae0bdac691057eb831;hb=5a7e62211c4714ea2aac35baac10cf448373d4f5;hp=50fb94c4ae1cc2a4f1fc3f7092403eec94296176;hpb=20ed3ceee71d97ca594931a537d035503e6d6ec4;p=libsigrok.git

diff --git a/hardware/common/scpi.c b/hardware/common/scpi.c
index 50fb94c4..a3101a9c 100644
--- a/hardware/common/scpi.c
+++ b/hardware/common/scpi.c
@@ -68,7 +68,6 @@ 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;
@@ -76,7 +75,6 @@ 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
@@ -217,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);
 }