X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_vxi.c;h=774b8b52ca2f43db2e0d2bc807820ed9bdf049b0;hb=9b915e3a41311bff4d7089f564f3b2716f2004a7;hp=9f6b2c356ea1444ce4def493014fca4766e1ef0d;hpb=055804e89ea0f6b4145040a0eeb2f4e6951692fe;p=libsigrok.git

diff --git a/src/scpi/scpi_vxi.c b/src/scpi/scpi_vxi.c
index 9f6b2c35..774b8b52 100644
--- a/src/scpi/scpi_vxi.c
+++ b/src/scpi/scpi_vxi.c
@@ -92,6 +92,16 @@ static int scpi_vxi_open(struct sr_scpi_dev_inst *scpi)
 	return SR_OK;
 }
 
+static int scpi_vxi_connection_id(struct sr_scpi_dev_inst *scpi,
+		char **connection_id)
+{
+	struct scpi_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)
 {
@@ -127,7 +137,7 @@ static int scpi_vxi_send(void *priv, const char *command)
 	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 = command;
+	write_parms.data.data_val = (char *)command;
 
 	if (!(write_resp = device_write_1(&write_parms, vxi->client))
 	    || write_resp->error) {
@@ -180,7 +190,7 @@ static int scpi_vxi_read_data(void *priv, char *buf, int maxlen)
 	}
 
 	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 */
 }
 
@@ -221,9 +231,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,