SR_DF_ANALOG_OLD and sr_datafeed_analog_old renames.

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

diff --git a/src/hardware/fluke-dmm/fluke.c b/src/hardware/fluke-dmm/fluke.c
index df0f2461c251cffbecd8c8dd154ccb87968cad86..c6ab4b01a35802a3357125c1958bfbdf809bf179 100644 (file)
--- a/src/hardware/fluke-dmm/fluke.c
+++ b/src/hardware/fluke-dmm/fluke.c
@@ -17,19 +17,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #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"
 
-static struct sr_datafeed_analog *handle_qm_18x(const struct sr_dev_inst *sdi,
+static struct sr_datafeed_analog_old *handle_qm_18x(const struct sr_dev_inst *sdi,
                char **tokens)
 {
-       struct sr_datafeed_analog *analog;
+       struct sr_datafeed_analog_old *analog;
        float fvalue;
        char *e, *u;
        gboolean is_oor;
@@ -40,14 +40,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 +56,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_old));
+       analog->data = g_malloc(sizeof(float));
        analog->channels = sdi->channels;
        analog->num_samples = 1;
        if (is_oor)
@@ -156,10 +154,10 @@ static struct sr_datafeed_analog *handle_qm_18x(const struct sr_dev_inst *sdi,
        return analog;
 }
 
-static struct sr_datafeed_analog *handle_qm_28x(const struct sr_dev_inst *sdi,
+static struct sr_datafeed_analog_old *handle_qm_28x(const struct sr_dev_inst *sdi,
                char **tokens)
 {
-       struct sr_datafeed_analog *analog;
+       struct sr_datafeed_analog_old *analog;
        float fvalue;
 
        if (!tokens[1])
@@ -170,10 +168,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_old));
+       analog->data = g_malloc(sizeof(float));
        analog->channels = sdi->channels;
        analog->num_samples = 1;
        *analog->data = fvalue;
@@ -366,7 +362,7 @@ static void handle_qm_19x_data(const struct sr_dev_inst *sdi, char **tokens)
 {
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        float fvalue;
 
        if (!strcmp(tokens[0], "9.9E+37")) {
@@ -401,7 +397,7 @@ static void handle_qm_19x_data(const struct sr_dev_inst *sdi, char **tokens)
        analog.mq = devc->mq;
        analog.unit = devc->unit;
        analog.mqflags = 0;
-       packet.type = SR_DF_ANALOG;
+       packet.type = SR_DF_ANALOG_OLD;
        packet.payload = &analog;
        sr_session_send(devc->cb_data, &packet);
        devc->num_samples++;
@@ -413,7 +409,7 @@ 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;
+       struct sr_datafeed_analog_old *analog;
        int num_tokens, n, i;
        char cmd[16], **tokens;
 
@@ -469,7 +465,7 @@ static void handle_line(const struct sr_dev_inst *sdi)
 
        if (analog) {
                /* Got a measurement. */
-               packet.type = SR_DF_ANALOG;
+               packet.type = SR_DF_ANALOG_OLD;
                packet.payload = analog;
                sr_session_send(devc->cb_data, &packet);
                devc->num_samples++;
@@ -498,7 +494,7 @@ 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) {
+               while (FLUKEDMM_BUFSIZE - devc->buflen - 1 > 0) {
                        len = serial_read_nonblocking(serial, devc->buf + devc->buflen, 1);
                        if (len < 1)
                                break;