X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fscpi%2Fscpi_vxi.c;h=2b8e50dee5688ce3a7383e29949ee959086d5dc2;hp=e7e48d62776e8974e94abccff8fd469729fd1b30;hb=7414fb55cb1f;hpb=515ab0889ebde4b373d620044a1a98da37153056
diff --git a/src/scpi/scpi_vxi.c b/src/scpi/scpi_vxi.c
index e7e48d62..2b8e50de 100644
--- a/src/scpi/scpi_vxi.c
+++ b/src/scpi/scpi_vxi.c
@@ -20,11 +20,13 @@
* along with this program. If not, see .
*/
+#include
#include
#include
-#include "vxi.h"
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
+#include "scpi.h"
+#include "vxi.h"
#define LOG_PREFIX "scpi_vxi"
#define VXI_DEFAULT_TIMEOUT_MS 2000
@@ -41,7 +43,7 @@ struct scpi_vxi {
static int scpi_vxi_dev_inst_new(void *priv, struct drv_context *drvc,
const char *resource, char **params, const char *serialcomm)
{
- struct scpi_vxi *vxi = priv;
+ struct scpi_vxi *vxi;
(void)drvc;
(void)resource;
@@ -52,19 +54,22 @@ static int scpi_vxi_dev_inst_new(void *priv, struct drv_context *drvc,
return SR_ERR;
}
+ vxi = priv;
vxi->address = g_strdup(params[1]);
vxi->instrument = g_strdup(params[2] ? params[2] : "inst0");
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;
Create_LinkParms link_parms;
Create_LinkResp *link_resp;
- vxi->client = clnt_create(vxi->address, DEVICE_CORE, DEVICE_CORE_VERSION, "tcp");
+ vxi = scpi->priv;
+ vxi->client = clnt_create(vxi->address,
+ DEVICE_CORE, DEVICE_CORE_VERSION, "tcp");
if (!vxi->client) {
sr_err("Client creation failed for %s", vxi->address);
return SR_ERR;
@@ -74,9 +79,10 @@ static int scpi_vxi_open(void *priv)
link_parms.clientId = (long) vxi->client;
link_parms.lockDevice = 0;
link_parms.lock_timeout = VXI_DEFAULT_TIMEOUT_MS;
- link_parms.device = "inst0";
+ link_parms.device = (char *)"inst0";
- if (!(link_resp = create_link_1(&link_parms, vxi->client))) {
+ link_resp = create_link_1(&link_parms, vxi->client);
+ if (!link_resp) {
sr_err("Link creation failed for %s", vxi->address);
return SR_ERR;
}
@@ -90,6 +96,17 @@ static int scpi_vxi_open(void *priv)
return SR_OK;
}
+static int scpi_vxi_connection_id(struct sr_scpi_dev_inst *scpi,
+ char **connection_id)
+{
+ struct scpi_vxi *vxi;
+
+ vxi = scpi->priv;
+ *connection_id = g_strdup_printf("%s/%s", scpi->prefix, vxi->address);
+
+ return SR_OK;
+}
+
static int scpi_vxi_source_add(struct sr_session *session, void *priv,
int events, int timeout, sr_receive_data_callback cb, void *cb_data)
{
@@ -113,44 +130,43 @@ static int scpi_vxi_source_remove(struct sr_session *session, void *priv)
static int scpi_vxi_send(void *priv, const char *command)
{
- struct scpi_vxi *vxi = priv;
+ struct scpi_vxi *vxi;
Device_WriteResp *write_resp;
Device_WriteParms write_parms;
- char *terminated_command;
- unsigned int len;
+ unsigned long len;
- terminated_command = g_strdup_printf("%s\r\n", command);
- len = strlen(terminated_command);
+ len = strlen(command);
+ vxi = priv;
write_parms.lid = vxi->link;
write_parms.io_timeout = VXI_DEFAULT_TIMEOUT_MS;
write_parms.lock_timeout = VXI_DEFAULT_TIMEOUT_MS;
write_parms.flags = DF_END;
write_parms.data.data_len = MIN(len, vxi->max_send_size);
- write_parms.data.data_val = terminated_command;
+ write_parms.data.data_val = (char *)command;
- if (!(write_resp = device_write_1(&write_parms, vxi->client))
- || write_resp->error) {
- sr_err("Device write failed for %s with error %d",
+ write_resp = device_write_1(&write_parms, vxi->client);
+ if (!write_resp || write_resp->error) {
+ sr_err("Device write failed for %s with error %ld",
vxi->address, write_resp ? write_resp->error : 0);
return SR_ERR;
}
- g_free(terminated_command);
-
- if (write_resp->size < len)
- sr_dbg("Only sent %d/%d bytes of SCPI command: '%s'.",
+ if (write_resp->size < len) {
+ sr_dbg("Only sent %lu/%lu bytes of SCPI command: '%s'.",
write_resp->size, len, command);
- else
+ } else {
sr_spew("Successfully sent SCPI command: '%s'.", command);
+ }
return SR_OK;
}
static int scpi_vxi_read_begin(void *priv)
{
- struct scpi_vxi *vxi = priv;
+ struct scpi_vxi *vxi;
+ vxi = priv;
vxi->read_complete = 0;
return SR_OK;
@@ -163,10 +179,11 @@ static int scpi_vxi_read_begin(void *priv)
static int scpi_vxi_read_data(void *priv, char *buf, int maxlen)
{
- struct scpi_vxi *vxi = priv;
+ struct scpi_vxi *vxi;
Device_ReadParms read_parms;
Device_ReadResp *read_resp;
+ vxi = priv;
read_parms.lid = vxi->link;
read_parms.io_timeout = VXI_DEFAULT_TIMEOUT_MS;
read_parms.lock_timeout = VXI_DEFAULT_TIMEOUT_MS;
@@ -174,15 +191,15 @@ static int scpi_vxi_read_data(void *priv, char *buf, int maxlen)
read_parms.termChar = 0;
read_parms.requestSize = maxlen;
- if (!(read_resp = device_read_1(&read_parms, vxi->client))
- || read_resp->error) {
- sr_err("Device read failed for %s with error %d",
+ read_resp = device_read_1(&read_parms, vxi->client);
+ if (!read_resp || read_resp->error) {
+ sr_err("Device read failed for %s with error %ld",
vxi->address, read_resp ? read_resp->error : 0);
return SR_ERR;
}
memcpy(buf, read_resp->data.data_val, read_resp->data.data_len);
- vxi->read_complete = read_resp->reason & (RRR_SIZE | RRR_TERM | RRR_END);
+ vxi->read_complete = read_resp->reason & (RRR_TERM | RRR_END);
return read_resp->data.data_len; /* actual number of bytes received */
}
@@ -193,15 +210,17 @@ 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;
Device_Error *dev_error;
+ vxi = scpi->priv;
if (!vxi->client)
return SR_ERR;
- if (!(dev_error = destroy_link_1(&vxi->link, vxi->client))) {
+ dev_error = destroy_link_1(&vxi->link, vxi->client);
+ if (!dev_error) {
sr_err("Link destruction failed for %s", vxi->address);
return SR_ERR;
}
@@ -214,8 +233,9 @@ static int scpi_vxi_close(void *priv)
static void scpi_vxi_free(void *priv)
{
- struct scpi_vxi *vxi = priv;
+ struct scpi_vxi *vxi;
+ vxi = priv;
g_free(vxi->address);
g_free(vxi->instrument);
}
@@ -223,9 +243,11 @@ static void scpi_vxi_free(void *priv)
SR_PRIV const struct sr_scpi_dev_inst scpi_vxi_dev = {
.name = "VXI",
.prefix = "vxi",
+ .transport = SCPI_TRANSPORT_VXI,
.priv_size = sizeof(struct scpi_vxi),
.dev_inst_new = scpi_vxi_dev_inst_new,
.open = scpi_vxi_open,
+ .connection_id = scpi_vxi_connection_id,
.source_add = scpi_vxi_source_add,
.source_remove = scpi_vxi_source_remove,
.send = scpi_vxi_send,