X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_serial.c;h=464924ce3086f2253c034339d22b0830917a5ce8;hb=b65adcedb89f69c7f52a6e98e73a3513c2648e95;hp=6811ad3688345ad81a5d93b81732d6ab5d761df1;hpb=9ea4018f2f7c3bac99f738334ebd57b1e6ae0a2c;p=libsigrok.git

diff --git a/src/scpi/scpi_serial.c b/src/scpi/scpi_serial.c
index 6811ad36..464924ce 100644
--- a/src/scpi/scpi_serial.c
+++ b/src/scpi/scpi_serial.c
@@ -30,7 +30,7 @@
 
 struct scpi_serial {
 	struct sr_serial_dev_inst *serial;
-	char got_newline;
+	gboolean got_newline;
 };
 
 static const struct {
@@ -93,7 +93,7 @@ static int scpi_serial_open(struct sr_scpi_dev_inst *scpi)
 	if (serial_flush(serial) != SR_OK)
 		return SR_ERR;
 
-	sscpi->got_newline = 0;
+	sscpi->got_newline = FALSE;
 
 	return SR_OK;
 }
@@ -117,20 +117,14 @@ 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;
+	int result;
 	struct scpi_serial *sscpi = priv;
 	struct sr_serial_dev_inst *serial = sscpi->serial;
 
-	len = strlen(command);
-	written = 0;
-	while (written < len) {
-		result = serial_write_nonblocking(serial,
-				command + written, len - written);
-		if (result < 0) {
-			sr_err("Error while sending SCPI command: '%s'.", 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'.", command);
+		return SR_ERR;
 	}
 
 	sr_spew("Successfully sent SCPI command: '%s'.", command);
@@ -141,7 +135,7 @@ static int scpi_serial_send(void *priv, const char *command)
 static int scpi_serial_read_begin(void *priv)
 {
 	struct scpi_serial *sscpi = priv;
-	sscpi->got_newline = 0;
+	sscpi->got_newline = FALSE;
 
 	return SR_OK;
 }
@@ -161,10 +155,10 @@ static int scpi_serial_read_data(void *priv, char *buf, int maxlen)
 		sr_spew("Read %d bytes into buffer.", ret);
 
 		if (buf[ret - 1] == '\n') {
-			sscpi->got_newline = 1;
+			sscpi->got_newline = TRUE;
 			sr_spew("Received terminator");
 		} else {
-			sscpi->got_newline = 0;
+			sscpi->got_newline = FALSE;
 		}
 	}