]> sigrok.org Git - libsigrok.git/commitdiff
norma-dmm: Make serial write call block.
authorMartin Ling <redacted>
Sun, 21 Sep 2014 18:14:05 +0000 (19:14 +0100)
committerUwe Hermann <redacted>
Wed, 24 Sep 2014 21:30:31 +0000 (23:30 +0200)
This call is executed from an event handler and was previously nonblocking,
but has no partial write handling. It sends a short packet so should be OK
to block, most likely the output buffer will be empty anyway.

src/hardware/norma-dmm/protocol.c

index 522d88a1749451c62fc1f0d9f527e656e1f7eaa5..035e991e8f1d40db9544acc531fc99bef4b8623a 100644 (file)
@@ -48,9 +48,8 @@ static int nma_send_req(const struct sr_dev_inst *sdi, int req, char *params)
        devc->last_req = req;
        devc->last_req_pending = TRUE;
 
-       if (serial_write(serial, buf, len) == -1) {
-               sr_err("Unable to send request: %d %s.",
-                       errno, strerror(errno));
+       if (serial_write_blocking(serial, buf, len) < 0) {
+               sr_err("Unable to send request.");
                devc->last_req_pending = FALSE;
                return SR_ERR;
        }