X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fscpi%2Fscpi_vxi.c;h=51861ee8b67d027d94b11e9dbf2bc5e5d5dfff65;hb=16a1d50a6372725c6b4f5b76175f62a64366bfa0;hp=2526b487fbf932bf27b9f3377c4f4df142c77a21;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git
diff --git a/src/scpi/scpi_vxi.c b/src/scpi/scpi_vxi.c
index 2526b487..51861ee8 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 "vxi.h"
#include
#include
-#include "vxi.h"
#include
#include "libsigrok-internal.h"
+#include "scpi.h"
#define LOG_PREFIX "scpi_vxi"
#define VXI_DEFAULT_TIMEOUT_MS 2000
@@ -58,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;
@@ -74,7 +76,7 @@ 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))) {
sr_err("Link creation failed for %s", vxi->address);
@@ -116,30 +118,26 @@ static int scpi_vxi_send(void *priv, const char *command)
struct scpi_vxi *vxi = priv;
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);
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",
+ 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'.",
+ sr_dbg("Only sent %lu/%lu bytes of SCPI command: '%s'.",
write_resp->size, len, command);
else
sr_spew("Successfully sent SCPI command: '%s'.", command);
@@ -176,13 +174,13 @@ static int scpi_vxi_read_data(void *priv, char *buf, int maxlen)
if (!(read_resp = device_read_1(&read_parms, vxi->client))
|| read_resp->error) {
- sr_err("Device read failed for %s with error %d",
+ 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,9 +191,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)