]> sigrok.org Git - libsigrok.git/commitdiff
agilent-dmm: Mark serial read call as nonblocking.
authorMartin Ling <redacted>
Tue, 16 Sep 2014 01:07:08 +0000 (02:07 +0100)
committerUwe Hermann <redacted>
Wed, 24 Sep 2014 21:18:21 +0000 (23:18 +0200)
This driver opens the port with the SERIAL_NONBLOCK flag, so this call is
already a nonblocking one, and is handled appropriately.

src/hardware/agilent-dmm/sched.c

index 7b41036542220211acf84586da305e2a50d701bf..2329c076cb176b6c4fb02640d96ad1aff5336d94 100644 (file)
@@ -106,7 +106,7 @@ SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data)
        if (revents == G_IO_IN) {
                /* Serial data arrived. */
                while(AGDMM_BUFSIZE - devc->buflen - 1 > 0) {
-                       len = serial_read(serial, devc->buf + devc->buflen, 1);
+                       len = serial_read_nonblocking(serial, devc->buf + devc->buflen, 1);
                        if (len < 1)
                                break;
                        devc->buflen += len;