X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcolead-slm%2Fprotocol.c;h=6b89ea14f512aeb9202e74f8f5e5a424801c0c7b;hb=c9fc06d7f0b13798f9ce6f4187c0a676aa32a4d0;hp=ef58ab73c484ae8c02340060e946a9f1e9483df8;hpb=9a10ce65d62526a24cbca2ee9e1cf55e132d6f7a;p=libsigrok.git diff --git a/src/hardware/colead-slm/protocol.c b/src/hardware/colead-slm/protocol.c index ef58ab73..6b89ea14 100644 --- a/src/hardware/colead-slm/protocol.c +++ b/src/hardware/colead-slm/protocol.c @@ -201,20 +201,20 @@ SR_PRIV int colead_slm_receive_data(int fd, int revents, void *cb_data) serial = sdi->conn; if (devc->state == IDLE) { - if (serial_read(serial, buf, 128) != 1 || buf[0] != 0x10) + if (serial_read_nonblocking(serial, buf, 128) != 1 || buf[0] != 0x10) /* Nothing there, or caught the tail end of a previous packet, * or some garbage. Unless it's a single "data ready" byte, * we don't want it. */ return TRUE; /* Got 0x10, "measurement ready". */ - if (serial_write(serial, "\x20", 1) == -1) + if (serial_write_blocking(serial, "\x20", 1) == -1) sr_err("unable to send command: %s", strerror(errno)); else { devc->state = COMMAND_SENT; devc->buflen = 0; } } else { - len = serial_read(serial, devc->buf + devc->buflen, + len = serial_read_nonblocking(serial, devc->buf + devc->buflen, 10 - devc->buflen); if (len < 1) return TRUE;