X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbrymen-dmm%2Fprotocol.c;h=5fb5ec29cb4c6cbfdcb87ffeb3bcb1b485a6bf3d;hb=c11a1e6122998b247df66c59d2076eb814818497;hp=dff7b985bfe071a8c6f90af6e14719c8aff81fbe;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/hardware/brymen-dmm/protocol.c b/src/hardware/brymen-dmm/protocol.c
index dff7b985..5fb5ec29 100644
--- a/src/hardware/brymen-dmm/protocol.c
+++ b/src/hardware/brymen-dmm/protocol.c
@@ -57,7 +57,7 @@ static void handle_new_data(struct sr_dev_inst *sdi)
 
 	/* Try to get as much data as the buffer can hold. */
 	len = DMM_BUFSIZE - devc->buflen;
-	len = serial_read(serial, devc->buf + devc->buflen, len);
+	len = serial_read_nonblocking(serial, devc->buf + devc->buflen, len);
 	if (len < 1) {
 		sr_err("Serial port read error: %d.", len);
 		return;
@@ -187,12 +187,12 @@ SR_PRIV int brymen_stream_detect(struct sr_serial_dev_inst *serial,
 	       "ms, baudrate = %d).", serial->port, timeout_ms, baudrate);
 
 	/* Assume 8n1 transmission. That is 10 bits for every byte. */
-	byte_delay_us = 10 * (1000000 / baudrate);
+	byte_delay_us = 10 * ((1000 * 1000) / baudrate);
 	start = g_get_monotonic_time();
 
 	packet_len = i = ibuf = len = 0;
 	while (ibuf < maxlen) {
-		len = serial_read(serial, &buf[ibuf], maxlen - ibuf);
+		len = serial_read_nonblocking(serial, &buf[ibuf], maxlen - ibuf);
 		if (len > 0) {
 			ibuf += len;
 			sr_spew("Read %d bytes.", len);
@@ -206,7 +206,7 @@ SR_PRIV int brymen_stream_detect(struct sr_serial_dev_inst *serial,
 			/* How large of a packet are we expecting? */
 			packet_len = stream_len;
 			status = get_packet_size(&buf[i], &packet_len);
-			switch(status) {
+			switch (status) {
 			case PACKET_HEADER_OK:
 				/* We know how much data we need to wait for. */
 				break;