X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fscpi%2Fscpi_vxi.c;h=8a99ec7474b3e5cee740f9e6367e0faa4651d315;hb=f227338297de002d8a76dc5e411dde8743751028;hp=cef0cf0beddcd2ac74e0ddba09f59fe553964147;hpb=6433156c3275df933e4bf6dcfb020c91fca0ae86;p=libsigrok.git
diff --git a/src/scpi/scpi_vxi.c b/src/scpi/scpi_vxi.c
index cef0cf0b..8a99ec74 100644
--- a/src/scpi/scpi_vxi.c
+++ b/src/scpi/scpi_vxi.c
@@ -20,6 +20,7 @@
* along with this program. If not, see .
*/
+#include
#include "vxi.h"
#include
#include
@@ -59,9 +60,9 @@ static int scpi_vxi_dev_inst_new(void *priv, struct drv_context *drvc,
return SR_OK;
}
-static int scpi_vxi_open(void *priv)
+static int scpi_vxi_open(struct sr_scpi_dev_inst *scpi)
{
- struct scpi_vxi *vxi = priv;
+ struct scpi_vxi *vxi = scpi->priv;
Create_LinkParms link_parms;
Create_LinkResp *link_resp;
@@ -75,7 +76,7 @@ static int scpi_vxi_open(void *priv)
link_parms.clientId = (long) vxi->client;
link_parms.lockDevice = 0;
link_parms.lock_timeout = VXI_DEFAULT_TIMEOUT_MS;
- link_parms.device = "inst0";
+ link_parms.device = (char *)"inst0";
if (!(link_resp = create_link_1(&link_parms, vxi->client))) {
sr_err("Link creation failed for %s", vxi->address);
@@ -194,9 +195,9 @@ static int scpi_vxi_read_complete(void *priv)
return vxi->read_complete;
}
-static int scpi_vxi_close(void *priv)
+static int scpi_vxi_close(struct sr_scpi_dev_inst *scpi)
{
- struct scpi_vxi *vxi = priv;
+ struct scpi_vxi *vxi = scpi->priv;
Device_Error *dev_error;
if (!vxi->client)