X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_vxi.c;h=8a99ec7474b3e5cee740f9e6367e0faa4651d315;hb=a078d3ec527c0a8180f59086e62a8905ae79aa65;hp=c1329088b294b2ff0d46a7c49121205b8c163f8c;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git

diff --git a/src/scpi/scpi_vxi.c b/src/scpi/scpi_vxi.c
index c1329088..8a99ec74 100644
--- a/src/scpi/scpi_vxi.c
+++ b/src/scpi/scpi_vxi.c
@@ -60,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;
 
@@ -76,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);
@@ -195,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)