X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffluke-dmm%2Ffluke.c;h=7604afa9a473a41d01497385a2bbb8340ec19f8f;hb=91ef511db2370904f8765a13e315fbddaf5ffe07;hp=edb6734adbd06166a1204cbd02012c16f77e060f;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/hardware/fluke-dmm/fluke.c b/src/hardware/fluke-dmm/fluke.c
index edb6734a..7604afa9 100644
--- a/src/hardware/fluke-dmm/fluke.c
+++ b/src/hardware/fluke-dmm/fluke.c
@@ -20,9 +20,8 @@
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include <errno.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "fluke-dmm.h"
 
@@ -40,14 +39,14 @@ static struct sr_datafeed_analog *handle_qm_18x(const struct sr_dev_inst *sdi,
 	if ((e = strstr(tokens[1], "Out of range"))) {
 		is_oor = TRUE;
 		fvalue = -1;
-		while(*e && *e != '.')
+		while (*e && *e != '.')
 			e++;
 	} else {
 		is_oor = FALSE;
 		/* Delimit the float, since sr_atof_ascii() wants only
 		 * a valid float here. */
 		e = tokens[1];
-		while(*e && *e != ' ')
+		while (*e && *e != ' ')
 			e++;
 		*e++ = '\0';
 		if (sr_atof_ascii(tokens[1], &fvalue) != SR_OK || fvalue == 0.0) {
@@ -56,13 +55,11 @@ static struct sr_datafeed_analog *handle_qm_18x(const struct sr_dev_inst *sdi,
 			return NULL;
 		}
 	}
-	while(*e && *e == ' ')
+	while (*e && *e == ' ')
 		e++;
 
-	if (!(analog = g_try_malloc0(sizeof(struct sr_datafeed_analog))))
-		return NULL;
-	if (!(analog->data = g_try_malloc(sizeof(float))))
-		return NULL;
+	analog = g_malloc0(sizeof(struct sr_datafeed_analog));
+	analog->data = g_malloc(sizeof(float));
 	analog->channels = sdi->channels;
 	analog->num_samples = 1;
 	if (is_oor)
@@ -170,10 +167,8 @@ static struct sr_datafeed_analog *handle_qm_28x(const struct sr_dev_inst *sdi,
 		return NULL;
 	}
 
-	if (!(analog = g_try_malloc0(sizeof(struct sr_datafeed_analog))))
-		return NULL;
-	if (!(analog->data = g_try_malloc(sizeof(float))))
-		return NULL;
+	analog = g_malloc0(sizeof(struct sr_datafeed_analog));
+	analog->data = g_malloc(sizeof(float));
 	analog->channels = sdi->channels;
 	analog->num_samples = 1;
 	*analog->data = fvalue;
@@ -386,7 +381,6 @@ static void handle_qm_19x_data(const struct sr_dev_inst *sdi, char **tokens)
 		/* Don't have valid metadata yet. */
 		return;
 
-
 	if (devc->mq == SR_MQ_RESISTANCE && isnan(fvalue))
 		fvalue = INFINITY;
 	else if (devc->mq == SR_MQ_CONTINUITY) {
@@ -456,9 +450,8 @@ static void handle_line(const struct sr_dev_inst *sdi)
 					/* Slip the request in now, before the main
 					 * timer loop asks for metadata again. */
 					n = sprintf(cmd, "QM %d\r", devc->meas_type);
-					if (serial_write(serial, cmd, n) == -1)
-						sr_err("Unable to send QM (measurement): %s.",
-								strerror(errno));
+					if (serial_write_blocking(serial, cmd, n, SERIAL_WRITE_TIMEOUT_MS) < 0)
+						sr_err("Unable to send QM (measurement).");
 				}
 			} else {
 				/* Response to QM <n> measurement request. */
@@ -500,8 +493,8 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
 	serial = sdi->conn;
 	if (revents == G_IO_IN) {
 		/* Serial data arrived. */
-		while(FLUKEDMM_BUFSIZE - devc->buflen - 1 > 0) {
-			len = serial_read(serial, devc->buf + devc->buflen, 1);
+		while (FLUKEDMM_BUFSIZE - devc->buflen - 1 > 0) {
+			len = serial_read_nonblocking(serial, devc->buf + devc->buflen, 1);
 			if (len < 1)
 				break;
 			devc->buflen++;
@@ -526,8 +519,8 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
 	 * out-of-sync or temporary disconnect issues. */
 	if ((devc->expect_response == FALSE && elapsed > devc->profile->poll_period)
 			|| elapsed > devc->profile->timeout) {
-		if (serial_write(serial, "QM\r", 3) == -1)
-			sr_err("Unable to send QM: %s.", strerror(errno));
+		if (serial_write_blocking(serial, "QM\r", 3, SERIAL_WRITE_TIMEOUT_MS) < 0)
+			sr_err("Unable to send QM.");
 		devc->cmd_sent_at = now;
 		devc->expect_response = TRUE;
 	}