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 119d0403727c9974a9384233170c20fc267bbc47..1e343a2f3f89254923965dc77a352888069a5aaf 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"
 
@@ -41,16 +41,18 @@ static void log_dmm_packet(const uint8_t *buf)
 static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
                          void *info)
 {
-       struct dmm_info *dmm = (struct dmm_info *) sdi->driver;
+       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;
+
        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;
@@ -65,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++;
        }
 }
@@ -75,11 +77,13 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
 /** Request packet, if required. */
 SR_PRIV int req_packet(struct sr_dev_inst *sdi)
 {
-       struct dmm_info *dmm = (struct dmm_info *) sdi->driver;
+       struct dmm_info *dmm;
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
        int ret;
 
+       dmm = (struct dmm_info *)sdi->driver;
+
        if (!dmm->packet_request)
                return SR_OK;
 
@@ -106,11 +110,13 @@ SR_PRIV int req_packet(struct sr_dev_inst *sdi)
 
 static void handle_new_data(struct sr_dev_inst *sdi, void *info)
 {
-       struct dmm_info *dmm = (struct dmm_info *) sdi->driver;
+       struct dmm_info *dmm;
        struct dev_context *devc;
        int len, i, offset = 0;
        struct sr_serial_dev_inst *serial;
 
+       dmm = (struct dmm_info *)sdi->driver;
+
        devc = sdi->priv;
        serial = sdi->conn;
 
@@ -165,13 +171,13 @@ int receive_data(int fd, int revents, void *cb_data)
        if (!(devc = sdi->priv))
                return TRUE;
 
-       dmm = (struct dmm_info *) sdi->driver;
+       dmm = (struct dmm_info *)sdi->driver;
 
        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))
@@ -180,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;
        }
 
@@ -188,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;
                }
        }