X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_serial.c;h=c73d1b4841a70ae434f50a6222d3555d881828ee;hb=92499a9c78b63e6a93d67de1883180d40fee7739;hp=096a77c1e74fefe823523dafd950496883f6c366;hpb=d38f4e7a0f0ecfa28d709ca6bc0834f0283a196f;p=libsigrok.git

diff --git a/src/scpi/scpi_serial.c b/src/scpi/scpi_serial.c
index 096a77c1..c73d1b48 100644
--- a/src/scpi/scpi_serial.c
+++ b/src/scpi/scpi_serial.c
@@ -28,13 +28,11 @@
 
 #define LOG_PREFIX "scpi_serial"
 
-#define BUFFER_SIZE 1024
+#ifdef HAVE_SERIAL_COMM
 
 struct scpi_serial {
 	struct sr_serial_dev_inst *serial;
-	char buffer[BUFFER_SIZE];
-	size_t count;
-	size_t read;
+	gboolean got_newline;
 };
 
 static const struct {
@@ -97,8 +95,18 @@ static int scpi_serial_open(struct sr_scpi_dev_inst *scpi)
 	if (serial_flush(serial) != SR_OK)
 		return SR_ERR;
 
-	sscpi->count = 0;
-	sscpi->read = 0;
+	sscpi->got_newline = FALSE;
+
+	return SR_OK;
+}
+
+static int scpi_serial_connection_id(struct sr_scpi_dev_inst *scpi,
+		char **connection_id)
+{
+	struct scpi_serial *sscpi = scpi->priv;
+	struct sr_serial_dev_inst *serial = sscpi->serial;
+
+	*connection_id = g_strdup(serial->port);
 
 	return SR_OK;
 }
@@ -122,27 +130,17 @@ static int scpi_serial_source_remove(struct sr_session *session, void *priv)
 
 static int scpi_serial_send(void *priv, const char *command)
 {
-	int len, result, written;
-	gchar *terminated_command;
+	int result;
 	struct scpi_serial *sscpi = priv;
 	struct sr_serial_dev_inst *serial = sscpi->serial;
 
-	terminated_command = g_strconcat(command, "\n", NULL);
-	len = strlen(terminated_command);
-	written = 0;
-	while (written < len) {
-		result = serial_write_nonblocking(serial,
-				terminated_command + written, len - written);
-		if (result < 0) {
-			sr_err("Error while sending SCPI command: '%s'.", command);
-			g_free(terminated_command);
-			return SR_ERR;
-		}
-		written += result;
+	result = serial_write_blocking(serial, command, strlen(command), 0);
+	if (result < 0) {
+		sr_err("Error while sending SCPI command '%s': %d.",
+			command, result);
+		return SR_ERR;
 	}
 
-	g_free(terminated_command);
-
 	sr_spew("Successfully sent SCPI command: '%s'.", command);
 
 	return SR_OK;
@@ -150,7 +148,8 @@ static int scpi_serial_send(void *priv, const char *command)
 
 static int scpi_serial_read_begin(void *priv)
 {
-	(void) priv;
+	struct scpi_serial *sscpi = priv;
+	sscpi->got_newline = FALSE;
 
 	return SR_OK;
 }
@@ -158,56 +157,31 @@ static int scpi_serial_read_begin(void *priv)
 static int scpi_serial_read_data(void *priv, char *buf, int maxlen)
 {
 	struct scpi_serial *sscpi = priv;
-	int len, ret;
-
-	len = BUFFER_SIZE - sscpi->count;
-
-	/* Try to read new data into the buffer if there is space. */
-	if (len > 0) {
-		ret = serial_read_nonblocking(sscpi->serial, sscpi->buffer + sscpi->count,
-				BUFFER_SIZE - sscpi->count);
+	int ret;
 
-		if (ret < 0)
-			return ret;
+	/* Try to read new data into the buffer. */
+	ret = serial_read_nonblocking(sscpi->serial, buf, maxlen);
 
-		sscpi->count += ret;
+	if (ret < 0)
+		return ret;
 
-		if (ret > 0)
-			sr_spew("Read %d bytes into buffer.", ret);
-	}
-
-	/* Return as many bytes as possible from buffer, excluding any trailing newline. */
-	if (sscpi->read < sscpi->count) {
-		len = sscpi->count - sscpi->read;
-		if (len > maxlen)
-			len = maxlen;
-		if (sscpi->buffer[sscpi->read + len - 1] == '\n')
-			len--;
-		sr_spew("Returning %d bytes from buffer.", len);
-		memcpy(buf, sscpi->buffer + sscpi->read, len);
-		sscpi->read += len;
-		if (sscpi->read == BUFFER_SIZE) {
-			sr_spew("Resetting buffer.");
-			sscpi->count = 0;
-			sscpi->read = 0;
+	if (ret > 0) {
+		if (buf[ret - 1] == '\n') {
+			sscpi->got_newline = TRUE;
+			sr_spew("Received terminator");
+		} else {
+			sscpi->got_newline = FALSE;
 		}
-		return len;
 	}
 
-	return 0;
+	return ret;
 }
 
 static int scpi_serial_read_complete(void *priv)
 {
 	struct scpi_serial *sscpi = priv;
 
-	/* If the next character is a newline, discard it and report complete. */
-	if (sscpi->read < sscpi->count && sscpi->buffer[sscpi->read] == '\n') {
-		sscpi->read++;
-		return 1;
-	} else {
-		return 0;
-	}
+	return sscpi->got_newline;
 }
 
 static int scpi_serial_close(struct sr_scpi_dev_inst *scpi)
@@ -227,10 +201,12 @@ static void scpi_serial_free(void *priv)
 SR_PRIV const struct sr_scpi_dev_inst scpi_serial_dev = {
 	.name          = "serial",
 	.prefix        = "",
+	.transport     = SCPI_TRANSPORT_SERIAL,
 	.priv_size     = sizeof(struct scpi_serial),
 	.scan          = scpi_serial_scan,
 	.dev_inst_new  = scpi_serial_dev_inst_new,
 	.open          = scpi_serial_open,
+	.connection_id = scpi_serial_connection_id,
 	.source_add    = scpi_serial_source_add,
 	.source_remove = scpi_serial_source_remove,
 	.send          = scpi_serial_send,
@@ -240,3 +216,5 @@ SR_PRIV const struct sr_scpi_dev_inst scpi_serial_dev = {
 	.close         = scpi_serial_close,
 	.free          = scpi_serial_free,
 };
+
+#endif