X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_visa.c;h=220ead4fd3e31db1a568ddeb62240cb69db960cd;hb=98654c99daf85bd2a81a9c87f517e800c31e34f2;hp=34ac9455d09038e97f21570df16634d655f5ac0b;hpb=515ab0889ebde4b373d620044a1a98da37153056;p=libsigrok.git

diff --git a/src/scpi/scpi_visa.c b/src/scpi/scpi_visa.c
index 34ac9455..220ead4f 100644
--- a/src/scpi/scpi_visa.c
+++ b/src/scpi/scpi_visa.c
@@ -17,10 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <visa.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
+#include "scpi.h"
 
 #define LOG_PREFIX "scpi_visa"
 
@@ -49,9 +51,9 @@ static int scpi_visa_dev_inst_new(void *priv, struct drv_context *drvc,
 	return SR_OK;
 }
 
-static int scpi_visa_open(void *priv)
+static int scpi_visa_open(struct sr_scpi_dev_inst *scpi)
 {
-	struct scpi_visa *vscpi = priv;
+	struct scpi_visa *vscpi = scpi->priv;
 
 	if (viOpenDefaultRM(&vscpi->rmgr) != VI_SUCCESS) {
 		sr_err("Cannot open default resource manager.");
@@ -138,9 +140,9 @@ static int scpi_visa_read_complete(void *priv)
 	return !(status & 16);
 }
 
-static int scpi_visa_close(void *priv)
+static int scpi_visa_close(struct sr_scpi_dev_inst *scpi)
 {
-	struct scpi_visa *vscpi = priv;
+	struct scpi_visa *vscpi = scpi->priv;
 
 	viClose(vscpi->vi);
 	viClose(vscpi->rmgr);