X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fscpi%2Fscpi_serial.c;h=23a5e3f02cb31acf784242d418dd1821f36ae57b;hp=6c4e63c7b9122756c7bfaaf2983d9e80203f4489;hb=8cd15dd4ce2fdbefbcc6e64632c8006e5404f253;hpb=1aba65727015e298f213c851dbc8d2d57d27d37b diff --git a/src/scpi/scpi_serial.c b/src/scpi/scpi_serial.c index 6c4e63c7..23a5e3f0 100644 --- a/src/scpi/scpi_serial.c +++ b/src/scpi/scpi_serial.c @@ -117,20 +117,15 @@ 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': %d.", + command, result); + return SR_ERR; } sr_spew("Successfully sent SCPI command: '%s'.", command); @@ -158,8 +153,6 @@ static int scpi_serial_read_data(void *priv, char *buf, int maxlen) return ret; if (ret > 0) { - sr_spew("Read %d bytes into buffer.", ret); - if (buf[ret - 1] == '\n') { sscpi->got_newline = TRUE; sr_spew("Received terminator");