X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_serial.c;h=ef507bb499170f67a277f60d88fa16109b3ad861;hb=04229f7bfc750f2b67e8dd54ac82ae6bb7eae1e4;hp=257ff88380c55096688c50422addd1ac5220a41d;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git diff --git a/src/scpi/scpi_serial.c b/src/scpi/scpi_serial.c index 257ff883..ef507bb4 100644 --- a/src/scpi/scpi_serial.c +++ b/src/scpi/scpi_serial.c @@ -85,9 +85,9 @@ static int scpi_serial_dev_inst_new(void *priv, struct drv_context *drvc, return SR_OK; } -static int scpi_serial_open(void *priv) +static int scpi_serial_open(struct sr_scpi_dev_inst *scpi) { - struct scpi_serial *sscpi = priv; + struct scpi_serial *sscpi = scpi->priv; struct sr_serial_dev_inst *serial = sscpi->serial; if (serial_open(serial, SERIAL_RDWR) != SR_OK) @@ -209,9 +209,9 @@ static int scpi_serial_read_complete(void *priv) } } -static int scpi_serial_close(void *priv) +static int scpi_serial_close(struct sr_scpi_dev_inst *scpi) { - struct scpi_serial *sscpi = priv; + struct scpi_serial *sscpi = scpi->priv; return serial_close(sscpi->serial); }