X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_tcp.c;h=29e7a4394aa8a54c1c69871f5362151ea6ff66db;hb=a0418c20d8eebb4ed127b04256e1b7a1dc2bdc7e;hp=a4cb694239d303ca20a5242a13d25c63468b86ed;hpb=d9251a2c9f1ca4380c27240ccca90c9f9ed46d3f;p=libsigrok.git

diff --git a/src/scpi/scpi_tcp.c b/src/scpi/scpi_tcp.c
index a4cb6942..29e7a439 100644
--- a/src/scpi/scpi_tcp.c
+++ b/src/scpi/scpi_tcp.c
@@ -115,6 +115,17 @@ static int scpi_tcp_open(struct sr_scpi_dev_inst *scpi)
 	return SR_OK;
 }
 
+static int scpi_tcp_connection_id(struct sr_scpi_dev_inst *scpi,
+		char **connection_id)
+{
+	struct scpi_tcp *tcp = scpi->priv;
+
+	*connection_id = g_strdup_printf("%s/%s:%s",
+		scpi->prefix, tcp->address, tcp->port);
+
+	return SR_OK;
+}
+
 static int scpi_tcp_source_add(struct sr_session *session, void *priv,
 		int events, int timeout, sr_receive_data_callback cb, void *cb_data)
 {
@@ -183,6 +194,21 @@ static int scpi_tcp_raw_read_data(void *priv, char *buf, int maxlen)
 	return len;
 }
 
+static int scpi_tcp_raw_write_data(void *priv, char *buf, int len)
+{
+	struct scpi_tcp *tcp = priv;
+	int sentlen;
+
+	sentlen = send(tcp->socket, buf, len, 0);
+
+	if (sentlen < 0) {
+		sr_err("Send error: %s.", g_strerror(errno));
+		return SR_ERR;
+	}
+
+	return sentlen;
+}
+
 static int scpi_tcp_rigol_read_data(void *priv, char *buf, int maxlen)
 {
 	struct scpi_tcp *tcp = priv;
@@ -248,14 +274,17 @@ static void scpi_tcp_free(void *priv)
 SR_PRIV const struct sr_scpi_dev_inst scpi_tcp_raw_dev = {
 	.name          = "RAW TCP",
 	.prefix        = "tcp-raw",
+	.transport     = SCPI_TRANSPORT_RAW_TCP,
 	.priv_size     = sizeof(struct scpi_tcp),
 	.dev_inst_new  = scpi_tcp_dev_inst_new,
 	.open          = scpi_tcp_open,
+	.connection_id = scpi_tcp_connection_id,
 	.source_add    = scpi_tcp_source_add,
 	.source_remove = scpi_tcp_source_remove,
 	.send          = scpi_tcp_send,
 	.read_begin    = scpi_tcp_read_begin,
 	.read_data     = scpi_tcp_raw_read_data,
+	.write_data    = scpi_tcp_raw_write_data,
 	.read_complete = scpi_tcp_read_complete,
 	.close         = scpi_tcp_close,
 	.free          = scpi_tcp_free,
@@ -264,9 +293,11 @@ SR_PRIV const struct sr_scpi_dev_inst scpi_tcp_raw_dev = {
 SR_PRIV const struct sr_scpi_dev_inst scpi_tcp_rigol_dev = {
 	.name          = "RIGOL TCP",
 	.prefix        = "tcp-rigol",
+	.transport     = SCPI_TRANSPORT_RIGOL_TCP,
 	.priv_size     = sizeof(struct scpi_tcp),
 	.dev_inst_new  = scpi_tcp_dev_inst_new,
 	.open          = scpi_tcp_open,
+	.connection_id = scpi_tcp_connection_id,
 	.source_add    = scpi_tcp_source_add,
 	.source_remove = scpi_tcp_source_remove,
 	.send          = scpi_tcp_send,