uni-t-ut32x: Shorten dev_list().

[libsigrok.git] / hardware / fluke-dmm / fluke.c

diff --git a/hardware/fluke-dmm/fluke.c b/hardware/fluke-dmm/fluke.c
index 0d11a7c3b240e8e0cf9a2159edaec591ba696541..d960228af2d63d11edc3b88269707630cab92155 100644 (file)
--- a/hardware/fluke-dmm/fluke.c
+++ b/hardware/fluke-dmm/fluke.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
@@ -26,7 +26,6 @@
 #include "libsigrok-internal.h"
 #include "fluke-dmm.h"
 
-
 static struct sr_datafeed_analog *handle_qm_18x(const struct sr_dev_inst *sdi,
                char **tokens)
 {
@@ -35,8 +34,6 @@ static struct sr_datafeed_analog *handle_qm_18x(const struct sr_dev_inst *sdi,
        char *e, *u;
        gboolean is_oor;
 
-       (void)sdi;
-
        if (strcmp(tokens[0], "QM") || !tokens[1])
                return NULL;
 
@@ -55,11 +52,12 @@ static struct sr_datafeed_analog *handle_qm_18x(const struct sr_dev_inst *sdi,
        while(*e && *e == ' ')
                e++;
 
-       /* TODO: Check malloc return value. */
-       analog = g_try_malloc0(sizeof(struct sr_datafeed_analog));
+       if (!(analog = g_try_malloc0(sizeof(struct sr_datafeed_analog))))
+               return NULL;
+       if (!(analog->data = g_try_malloc(sizeof(float))))
+               return NULL;
+       analog->probes = sdi->probes;
        analog->num_samples = 1;
-       /* TODO: Check malloc return value. */
-       analog->data = g_try_malloc(sizeof(float));
        if (is_oor)
                *analog->data = NAN;
        else
@@ -158,8 +156,6 @@ static struct sr_datafeed_analog *handle_qm_28x(const struct sr_dev_inst *sdi,
        float fvalue;
        char *eptr;
 
-       (void)sdi;
-
        if (!tokens[1])
                return NULL;
 
@@ -169,11 +165,12 @@ static struct sr_datafeed_analog *handle_qm_28x(const struct sr_dev_inst *sdi,
                return NULL;
        }
 
-       /* TODO: Check malloc return value. */
-       analog = g_try_malloc0(sizeof(struct sr_datafeed_analog));
+       if (!(analog = g_try_malloc0(sizeof(struct sr_datafeed_analog))))
+               return NULL;
+       if (!(analog->data = g_try_malloc(sizeof(float))))
+               return NULL;
+       analog->probes = sdi->probes;
        analog->num_samples = 1;
-       /* TODO: Check malloc return value. */
-       analog->data = g_try_malloc(sizeof(float));
        *analog->data = fvalue;
        analog->mq = -1;
 
@@ -396,6 +393,7 @@ static void handle_qm_19x_data(const struct sr_dev_inst *sdi, char **tokens)
                        fvalue = 1.0;
        }
 
+       analog.probes = sdi->probes;
        analog.num_samples = 1;
        analog.data = &fvalue;
        analog.mq = devc->mq;
@@ -411,12 +409,14 @@ static void handle_qm_19x_data(const struct sr_dev_inst *sdi, char **tokens)
 static void handle_line(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
+       struct sr_serial_dev_inst *serial;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_analog *analog;
        int num_tokens, n, i;
        char cmd[16], **tokens;
 
        devc = sdi->priv;
+       serial = sdi->conn;
        sr_spew("Received line '%s' (%d).", devc->buf, devc->buflen);
 
        if (devc->buflen == 1) {
@@ -453,7 +453,7 @@ 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(devc->serial, cmd, n) == -1)
+                                       if (serial_write(serial, cmd, n) == -1)
                                                sr_err("Unable to send QM (measurement): %s.",
                                                                strerror(errno));
                                }
@@ -482,6 +482,7 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
 {
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
+       struct sr_serial_dev_inst *serial;
        int len;
        int64_t now, elapsed;
 
@@ -493,10 +494,11 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
        if (!(devc = sdi->priv))
                return TRUE;
 
+       serial = sdi->conn;
        if (revents == G_IO_IN) {
                /* Serial data arrived. */
                while(FLUKEDMM_BUFSIZE - devc->buflen - 1 > 0) {
-                       len = serial_read(devc->serial, devc->buf + devc->buflen, 1);
+                       len = serial_read(serial, devc->buf + devc->buflen, 1);
                        if (len < 1)
                                break;
                        devc->buflen++;
@@ -509,7 +511,7 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
                }
        }
 
-       if (devc->num_samples >= devc->limit_samples) {
+       if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
                sdi->driver->dev_acquisition_stop(sdi, cb_data);
                return TRUE;
        }
@@ -521,7 +523,7 @@ 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(devc->serial, "QM\r", 3) == -1)
+               if (serial_write(serial, "QM\r", 3) == -1)
                        sr_err("Unable to send QM: %s.", strerror(errno));
                devc->cmd_sent_at = now;
                devc->expect_response = TRUE;
@@ -529,5 +531,3 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
 
        return TRUE;
 }
-
-