Consistently don't check sdi->priv in dev_acquisition_start().

[libsigrok.git] / src / hardware / serial-dmm / protocol.c

diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c
index 6128e493f66888bb97aab00e132095c441308c45..8e9b3979efe303ca4c33526e5c7293113076fd46 100644 (file)
--- a/src/hardware/serial-dmm/protocol.c
+++ b/src/hardware/serial-dmm/protocol.c
@@ -18,12 +18,12 @@
  * 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 "protocol.h"
 
@@ -44,7 +44,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
        struct dmm_info *dmm;
        float floatval;
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        struct dev_context *devc;
 
        dmm = (struct dmm_info *)sdi->driver;
@@ -52,7 +52,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
        log_dmm_packet(buf);
        devc = sdi->priv;
 
-       memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+       memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
 
        analog.channels = sdi->channels;
        analog.num_samples = 1;
@@ -67,7 +67,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
 
        if (analog.mq != -1) {
                /* 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++;
@@ -175,9 +175,9 @@ int receive_data(int fd, int revents, void *cb_data)
 
        if (revents == G_IO_IN) {
                /* Serial data arrived. */
-               info = malloc(dmm->info_size);
+               info = g_malloc(dmm->info_size);
                handle_new_data(sdi, info);
-               free(info);
+               g_free(info);
        } else {
                /* Timeout; send another packet request if DMM needs it. */
                if (dmm->packet_request && (req_packet(sdi) < 0))