From: Aurelien Jacobs <redacted>
Date: Sat, 11 Jan 2014 23:38:08 +0000 (+0100)
Subject: scpi_tcp: split into scpi_tcp_raw and scpi_tcp_rigol
X-Git-Tag: libsigrok-0.3.0~310
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=104ed125532596a43f2d95d9a5d05bd6d51b9afa

scpi_tcp: split into scpi_tcp_raw and scpi_tcp_rigol

The current implementation is renamed to tcp-rigol as it seems to be
a Rigol proprietary protocol used only on Rigol VS5000 series.

A new tcp-raw implementation is introduced which simply carries raw SCPI
commands over TCP. It is probably a much more common protocol and it is
at least available on Rigol DS2000 series on port 5555.
---

diff --git a/hardware/common/scpi.c b/hardware/common/scpi.c
index c2221c11..beb33423 100644
--- a/hardware/common/scpi.c
+++ b/hardware/common/scpi.c
@@ -66,12 +66,14 @@ static int parse_strict_bool(const char *str, gboolean *ret)
 }
 
 SR_PRIV extern const struct sr_scpi_dev_inst scpi_serial_dev;
-SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_dev;
+SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_raw_dev;
+SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_rigol_dev;
 SR_PRIV extern const struct sr_scpi_dev_inst scpi_usbtmc_dev;
 SR_PRIV extern const struct sr_scpi_dev_inst scpi_vxi_dev;
 
 static const struct sr_scpi_dev_inst *scpi_devs[] = {
-	&scpi_tcp_dev,
+	&scpi_tcp_raw_dev,
+	&scpi_tcp_rigol_dev,
 	&scpi_usbtmc_dev,
 #ifdef HAVE_RPC
 	&scpi_vxi_dev,
diff --git a/hardware/common/scpi_tcp.c b/hardware/common/scpi_tcp.c
index 0de2ff54..86972f06 100644
--- a/hardware/common/scpi_tcp.c
+++ b/hardware/common/scpi_tcp.c
@@ -165,7 +165,26 @@ SR_PRIV int scpi_tcp_read_begin(void *priv)
 	return SR_OK;
 }
 
-SR_PRIV int scpi_tcp_read_data(void *priv, char *buf, int maxlen)
+SR_PRIV int scpi_tcp_raw_read_data(void *priv, char *buf, int maxlen)
+{
+	struct scpi_tcp *tcp = priv;
+	int len;
+
+	len = recv(tcp->socket, buf, maxlen, 0);
+
+	if (len < 0) {
+		sr_err("Receive error: %s", strerror(errno));
+		return SR_ERR;
+	}
+
+	tcp->length_bytes_read = LENGTH_BYTES;
+	tcp->response_length = len < maxlen ? len : maxlen + 1;
+	tcp->response_bytes_read = len;
+
+	return len;
+}
+
+SR_PRIV int scpi_tcp_rigol_read_data(void *priv, char *buf, int maxlen)
 {
 	struct scpi_tcp *tcp = priv;
 	int len;
@@ -227,9 +246,25 @@ SR_PRIV void scpi_tcp_free(void *priv)
 	g_free(tcp->port);
 }
 
-SR_PRIV const struct sr_scpi_dev_inst scpi_tcp_dev = {
-	.name          = "TCP",
-	.prefix        = "tcp",
+SR_PRIV const struct sr_scpi_dev_inst scpi_tcp_raw_dev = {
+	.name          = "RAW TCP",
+	.prefix        = "tcp-raw",
+	.priv_size     = sizeof(struct scpi_tcp),
+	.dev_inst_new  = scpi_tcp_dev_inst_new,
+	.open          = scpi_tcp_open,
+	.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,
+	.read_complete = scpi_tcp_read_complete,
+	.close         = scpi_tcp_close,
+	.free          = scpi_tcp_free,
+};
+
+SR_PRIV const struct sr_scpi_dev_inst scpi_tcp_rigol_dev = {
+	.name          = "RIGOL TCP",
+	.prefix        = "tcp-rigol",
 	.priv_size     = sizeof(struct scpi_tcp),
 	.dev_inst_new  = scpi_tcp_dev_inst_new,
 	.open          = scpi_tcp_open,
@@ -237,7 +272,7 @@ SR_PRIV const struct sr_scpi_dev_inst scpi_tcp_dev = {
 	.source_remove = scpi_tcp_source_remove,
 	.send          = scpi_tcp_send,
 	.read_begin    = scpi_tcp_read_begin,
-	.read_data     = scpi_tcp_read_data,
+	.read_data     = scpi_tcp_rigol_read_data,
 	.read_complete = scpi_tcp_read_complete,
 	.close         = scpi_tcp_close,
 	.free          = scpi_tcp_free,