X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fscpi%2Fscpi_libgpib.c;h=7632f74c9dc2ecf530986011ae02b08dd402f8cc;hp=31522eb19bcff871fba915ecfc13e1bd2111e2a3;hb=04229f7bfc750f2b67e8dd54ac82ae6bb7eae1e4;hpb=27cd728f8a52026be5d83890c3d911fa29ee62f9 diff --git a/src/scpi/scpi_libgpib.c b/src/scpi/scpi_libgpib.c index 31522eb1..7632f74c 100644 --- a/src/scpi/scpi_libgpib.c +++ b/src/scpi/scpi_libgpib.c @@ -49,9 +49,9 @@ static int scpi_gpib_dev_inst_new(void *priv, struct drv_context *drvc, return SR_OK; } -static int scpi_gpib_open(void *priv) +static int scpi_gpib_open(struct sr_scpi_dev_inst *scpi) { - struct scpi_gpib *gscpi = priv; + struct scpi_gpib *gscpi = scpi->priv; if ((gscpi->descriptor = ibfind(gscpi->name)) < 0) return SR_ERR; @@ -134,9 +134,9 @@ static int scpi_gpib_read_complete(void *priv) return gscpi->read_started && (ibsta & END); } -static int scpi_gpib_close(void *priv) +static int scpi_gpib_close(struct sr_scpi_dev_inst *scpi) { - struct scpi_gpib *gscpi = priv; + struct scpi_gpib *gscpi = scpi->priv; ibonl(gscpi->descriptor, 0);