X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_visa.c;h=220ead4fd3e31db1a568ddeb62240cb69db960cd;hb=2c24077466a299ead689c90f01f55f6d86c7386b;hp=335de05feacbda33af72614143fe4e17583832a7;hpb=5a1afc0907abfee5848484f944789213d6be9752;p=libsigrok.git diff --git a/src/scpi/scpi_visa.c b/src/scpi/scpi_visa.c index 335de05f..220ead4f 100644 --- a/src/scpi/scpi_visa.c +++ b/src/scpi/scpi_visa.c @@ -17,6 +17,7 @@ * along with this program. If not, see . */ +#include #include #include #include @@ -50,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."); @@ -139,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);