dev_acquisition_{start,stop}(): Drop duplicate 'cb_data' parameter.

[libsigrok.git] / src / hardware / mic-985xx / protocol.c

diff --git a/src/hardware/mic-985xx/protocol.c b/src/hardware/mic-985xx/protocol.c
index 9d0e603b1daffad54af5ecd1e42133ab47b5d4fe..151b7c837af7cbf8f021c5c900c0e2fea0848f62 100644 (file)
--- a/src/hardware/mic-985xx/protocol.c
+++ b/src/hardware/mic-985xx/protocol.c
@@ -18,13 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <config.h>
 #include "protocol.h"
 
 static int mic_send(struct sr_serial_dev_inst *serial, const char *cmd)
 {
        int ret;
 
-       if ((ret = serial_write_blocking(serial, cmd, strlen(cmd))) < 0) {
+       if ((ret = serial_write_blocking(serial, cmd, strlen(cmd),
+                       serial_timeout(serial, strlen(cmd)))) < 0) {
                sr_err("Error sending '%s' command: %d.", cmd, ret);
                return SR_ERR;
        }
@@ -94,6 +96,9 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
        float temperature, humidity;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_analog analog;
+       struct sr_analog_encoding encoding;
+       struct sr_analog_meaning meaning;
+       struct sr_analog_spec spec;
        struct dev_context *devc;
        GSList *l;
        int ret;
@@ -108,8 +113,7 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
                return SR_ERR;
        }
 
-       /* Clear 'analog', otherwise it'll contain random garbage. */
-       memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+       sr_analog_init(&analog, &encoding, &meaning, &spec, 3);
 
        /* Common values for both channels. */
        packet.type = SR_DF_ANALOG;
@@ -119,22 +123,22 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
        /* Temperature. */
        l = g_slist_copy(sdi->channels);
        l = g_slist_remove_link(l, g_slist_nth(l, 1));
-       analog.channels = l;
-       analog.mq = SR_MQ_TEMPERATURE;
-       analog.unit = SR_UNIT_CELSIUS; /* TODO: Use C/F correctly. */
+       meaning.channels = l;
+       meaning.mq = SR_MQ_TEMPERATURE;
+       meaning.unit = SR_UNIT_CELSIUS; /* TODO: Use C/F correctly. */
        analog.data = &temperature;
-       sr_session_send(devc->cb_data, &packet);
+       sr_session_send(sdi, &packet);
        g_slist_free(l);
 
        /* Humidity. */
        if (mic_devs[idx].has_humidity) {
                l = g_slist_copy(sdi->channels);
                l = g_slist_remove_link(l, g_slist_nth(l, 0));
-               analog.channels = l;
-               analog.mq = SR_MQ_RELATIVE_HUMIDITY;
-               analog.unit = SR_UNIT_PERCENTAGE;
+               meaning.channels = l;
+               meaning.mq = SR_MQ_RELATIVE_HUMIDITY;
+               meaning.unit = SR_UNIT_PERCENTAGE;
                analog.data = &humidity;
-               sr_session_send(devc->cb_data, &packet);
+               sr_session_send(sdi, &packet);
                g_slist_free(l);
        }
 
@@ -209,7 +213,7 @@ static int receive_data(int fd, int revents, int idx, 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;
        }
 
@@ -217,7 +221,7 @@ static int receive_data(int fd, int revents, int idx, void *cb_data)
                t = (g_get_monotonic_time() - devc->starttime) / 1000;
                if (t > (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;
                }
        }