BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scpi: Pass SCPI device instance to open and close callbacks. 

Only close() really needs this (for access to a Rigol firmware quirk),
but do the same in open() for consistency.
This commit is contained in:
Bert Vermeulen 2015-09-21 13:41:03 +02:00
parent 27cd728f8a
commit 04229f7bfc
8 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/scpi.h
View File

@ -77,7 +77,7 @@ struct sr_scpi_dev_inst {
GSList *(*scan)(struct drv_context *drvc);
int (*dev_inst_new)(void *priv, struct drv_context *drvc,
const char *resource, char **params, const char *serialcomm);
int (*open)(void *priv);
int (*open)(struct sr_scpi_dev_inst *scpi);
int (*source_add)(struct sr_session *session, void *priv, int events,
int timeout, sr_receive_data_callback cb, void *cb_data);
int (*source_remove)(struct sr_session *session, void *priv);
@ -85,7 +85,7 @@ struct sr_scpi_dev_inst {
int (*read_begin)(void *priv);
int (*read_data)(void *priv, char *buf, int maxlen);
int (*read_complete)(void *priv);
int (*close)(void *priv);
int (*close)(struct sr_scpi_dev_inst *scpi);
void (*free)(void *priv);
unsigned int read_timeout_ms;
void *priv;

4
src/scpi/scpi.c
View File

@ -210,7 +210,7 @@ SR_PRIV struct sr_scpi_dev_inst *scpi_dev_inst_new(struct drv_context *drvc,
*/
SR_PRIV int sr_scpi_open(struct sr_scpi_dev_inst *scpi)
{
return scpi->open(scpi->priv);
return scpi->open(scpi);
}
/**
@ -352,7 +352,7 @@ SR_PRIV int sr_scpi_read_complete(struct sr_scpi_dev_inst *scpi)
*/
SR_PRIV int sr_scpi_close(struct sr_scpi_dev_inst *scpi)
{
return scpi->close(scpi->priv);
return scpi->close(scpi);
}
/**

8
src/scpi/scpi_libgpib.c
View File

@ -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);

8
src/scpi/scpi_serial.c
View File

@ -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);
}

8
src/scpi/scpi_tcp.c
View File

@ -72,9 +72,9 @@ static int scpi_tcp_dev_inst_new(void *priv, struct drv_context *drvc,
return SR_OK;
}
static int scpi_tcp_open(void *priv)
static int scpi_tcp_open(struct sr_scpi_dev_inst *scpi)
{
struct scpi_tcp *tcp = priv;
struct scpi_tcp *tcp = scpi->priv;
struct addrinfo hints;
struct addrinfo *results, *res;
int err;
@ -230,9 +230,9 @@ static int scpi_tcp_read_complete(void *priv)
tcp->response_bytes_read >= tcp->response_length);
}
static int scpi_tcp_close(void *priv)
static int scpi_tcp_close(struct sr_scpi_dev_inst *scpi)
{
struct scpi_tcp *tcp = priv;
struct scpi_tcp *tcp = scpi->priv;
if (close(tcp->socket) < 0)
return SR_ERR;

10
src/scpi/scpi_usbtmc_libusb.c
View File

@ -289,9 +289,9 @@ static void scpi_usbtmc_local(struct scpi_usbtmc_libusb *uscpi)
return;
}
static int scpi_usbtmc_libusb_open(void *priv)
static int scpi_usbtmc_libusb_open(struct sr_scpi_dev_inst *scpi)
{
struct scpi_usbtmc_libusb *uscpi = priv;
struct scpi_usbtmc_libusb *uscpi = scpi->priv;
struct sr_usb_dev_inst *usb = uscpi->usb;
struct libusb_device *dev;
struct libusb_device_descriptor des;
@ -634,11 +634,11 @@ static int scpi_usbtmc_libusb_read_complete(void *priv)
uscpi->bulkin_attributes & EOM;
}
static int scpi_usbtmc_libusb_close(void *priv)
static int scpi_usbtmc_libusb_close(struct sr_scpi_dev_inst *scpi)
{
int ret;
struct scpi_usbtmc_libusb *uscpi = priv;
struct scpi_usbtmc_libusb *uscpi = scpi->priv;
struct sr_usb_dev_inst *usb = uscpi->usb;
int ret;
if (!usb->devhdl)
return SR_ERR;

8
src/scpi/scpi_visa.c
View File

@ -51,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.");
@ -140,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);

8
src/scpi/scpi_vxi.c
View File

@ -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;
@ -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)