Backport recent changes from mainline.

[libsigrok.git] / src / scpi / scpi_serial.c

diff --git a/src/scpi/scpi_serial.c b/src/scpi/scpi_serial.c
index 096a77c1e74fefe823523dafd950496883f6c366..23a5e3f02cb31acf784242d418dd1821f36ae57b 100644 (file)
--- a/src/scpi/scpi_serial.c
+++ b/src/scpi/scpi_serial.c
@@ -28,13 +28,9 @@
 
 #define LOG_PREFIX "scpi_serial"
 
-#define BUFFER_SIZE 1024
-
 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 +93,7 @@ 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;
 }
@@ -122,27 +117,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 +135,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 +144,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;
+       int ret;
 
-       len = BUFFER_SIZE - sscpi->count;
+       /* Try to read new data into the buffer. */
+       ret = serial_read_nonblocking(sscpi->serial, buf, maxlen);
 
-       /* 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);
+       if (ret < 0)
+               return ret;
 
-               if (ret < 0)
-                       return ret;
-
-               sscpi->count += 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)