Remove unnecessary dev_clear() callbacks

[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 edf8382b35d64c778f7e4b8207aec112c3562e67..1e343a2f3f89254923965dc77a352888069a5aaf 100644 (file)
--- a/src/hardware/serial-dmm/protocol.c
+++ b/src/hardware/serial-dmm/protocol.c
@@ -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,9 +67,9 @@ 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);
+               sr_session_send(sdi, &packet);
                devc->num_samples++;
        }
 }
@@ -186,7 +186,7 @@ int receive_data(int fd, int revents, void *cb_data)
 
        if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
                sr_info("Requested number of samples reached.");
-               sdi->driver->dev_acquisition_stop(sdi, cb_data);
+               sdi->driver->dev_acquisition_stop(sdi);
                return TRUE;
        }
 
@@ -194,7 +194,7 @@ int receive_data(int fd, int revents, void *cb_data)
                time = (g_get_monotonic_time() - devc->starttime) / 1000;
                if (time > (int64_t)devc->limit_msec) {
                        sr_info("Requested time limit reached.");
-                       sdi->driver->dev_acquisition_stop(sdi, cb_data);
+                       sdi->driver->dev_acquisition_stop(sdi);
                        return TRUE;
                }
        }