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:
parent
27cd728f8a
commit
04229f7bfc
|
@ -77,7 +77,7 @@ struct sr_scpi_dev_inst {
|
||||||
GSList *(*scan)(struct drv_context *drvc);
|
GSList *(*scan)(struct drv_context *drvc);
|
||||||
int (*dev_inst_new)(void *priv, struct drv_context *drvc,
|
int (*dev_inst_new)(void *priv, struct drv_context *drvc,
|
||||||
const char *resource, char **params, const char *serialcomm);
|
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 (*source_add)(struct sr_session *session, void *priv, int events,
|
||||||
int timeout, sr_receive_data_callback cb, void *cb_data);
|
int timeout, sr_receive_data_callback cb, void *cb_data);
|
||||||
int (*source_remove)(struct sr_session *session, void *priv);
|
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_begin)(void *priv);
|
||||||
int (*read_data)(void *priv, char *buf, int maxlen);
|
int (*read_data)(void *priv, char *buf, int maxlen);
|
||||||
int (*read_complete)(void *priv);
|
int (*read_complete)(void *priv);
|
||||||
int (*close)(void *priv);
|
int (*close)(struct sr_scpi_dev_inst *scpi);
|
||||||
void (*free)(void *priv);
|
void (*free)(void *priv);
|
||||||
unsigned int read_timeout_ms;
|
unsigned int read_timeout_ms;
|
||||||
void *priv;
|
void *priv;
|
||||||
|
|
|
@ -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)
|
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)
|
SR_PRIV int sr_scpi_close(struct sr_scpi_dev_inst *scpi)
|
||||||
{
|
{
|
||||||
return scpi->close(scpi->priv);
|
return scpi->close(scpi);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -49,9 +49,9 @@ static int scpi_gpib_dev_inst_new(void *priv, struct drv_context *drvc,
|
||||||
return SR_OK;
|
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)
|
if ((gscpi->descriptor = ibfind(gscpi->name)) < 0)
|
||||||
return SR_ERR;
|
return SR_ERR;
|
||||||
|
@ -134,9 +134,9 @@ static int scpi_gpib_read_complete(void *priv)
|
||||||
return gscpi->read_started && (ibsta & END);
|
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);
|
ibonl(gscpi->descriptor, 0);
|
||||||
|
|
||||||
|
|
|
@ -85,9 +85,9 @@ static int scpi_serial_dev_inst_new(void *priv, struct drv_context *drvc,
|
||||||
return SR_OK;
|
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;
|
struct sr_serial_dev_inst *serial = sscpi->serial;
|
||||||
|
|
||||||
if (serial_open(serial, SERIAL_RDWR) != SR_OK)
|
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);
|
return serial_close(sscpi->serial);
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,9 +72,9 @@ static int scpi_tcp_dev_inst_new(void *priv, struct drv_context *drvc,
|
||||||
return SR_OK;
|
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 hints;
|
||||||
struct addrinfo *results, *res;
|
struct addrinfo *results, *res;
|
||||||
int err;
|
int err;
|
||||||
|
@ -230,9 +230,9 @@ static int scpi_tcp_read_complete(void *priv)
|
||||||
tcp->response_bytes_read >= tcp->response_length);
|
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)
|
if (close(tcp->socket) < 0)
|
||||||
return SR_ERR;
|
return SR_ERR;
|
||||||
|
|
|
@ -289,9 +289,9 @@ static void scpi_usbtmc_local(struct scpi_usbtmc_libusb *uscpi)
|
||||||
return;
|
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 sr_usb_dev_inst *usb = uscpi->usb;
|
||||||
struct libusb_device *dev;
|
struct libusb_device *dev;
|
||||||
struct libusb_device_descriptor des;
|
struct libusb_device_descriptor des;
|
||||||
|
@ -634,11 +634,11 @@ static int scpi_usbtmc_libusb_read_complete(void *priv)
|
||||||
uscpi->bulkin_attributes & EOM;
|
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 = scpi->priv;
|
||||||
struct scpi_usbtmc_libusb *uscpi = priv;
|
|
||||||
struct sr_usb_dev_inst *usb = uscpi->usb;
|
struct sr_usb_dev_inst *usb = uscpi->usb;
|
||||||
|
int ret;
|
||||||
|
|
||||||
if (!usb->devhdl)
|
if (!usb->devhdl)
|
||||||
return SR_ERR;
|
return SR_ERR;
|
||||||
|
|
|
@ -51,9 +51,9 @@ static int scpi_visa_dev_inst_new(void *priv, struct drv_context *drvc,
|
||||||
return SR_OK;
|
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) {
|
if (viOpenDefaultRM(&vscpi->rmgr) != VI_SUCCESS) {
|
||||||
sr_err("Cannot open default resource manager.");
|
sr_err("Cannot open default resource manager.");
|
||||||
|
@ -140,9 +140,9 @@ static int scpi_visa_read_complete(void *priv)
|
||||||
return !(status & 16);
|
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->vi);
|
||||||
viClose(vscpi->rmgr);
|
viClose(vscpi->rmgr);
|
||||||
|
|
|
@ -60,9 +60,9 @@ static int scpi_vxi_dev_inst_new(void *priv, struct drv_context *drvc,
|
||||||
return SR_OK;
|
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_LinkParms link_parms;
|
||||||
Create_LinkResp *link_resp;
|
Create_LinkResp *link_resp;
|
||||||
|
|
||||||
|
@ -195,9 +195,9 @@ static int scpi_vxi_read_complete(void *priv)
|
||||||
return vxi->read_complete;
|
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;
|
Device_Error *dev_error;
|
||||||
|
|
||||||
if (!vxi->client)
|
if (!vxi->client)
|
||||||
|
|
Loading…
Reference in New Issue