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

[libsigrok.git] / src / hardware / teleinfo / protocol.c

diff --git a/src/hardware/teleinfo/protocol.c b/src/hardware/teleinfo/protocol.c
index d2b96e1f5c8c8ad58fbbf6ab9a81abfd2e55bbfd..21b695bd5be5041d72a2c24a2a1699624725e308 100644 (file)
--- a/src/hardware/teleinfo/protocol.c
+++ b/src/hardware/teleinfo/protocol.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
@@ -59,7 +60,7 @@ static void teleinfo_send_value(struct sr_dev_inst *sdi, const char *channel_nam
 {
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        struct sr_channel *ch;
 
        devc = sdi->priv;
@@ -68,22 +69,21 @@ static void teleinfo_send_value(struct sr_dev_inst *sdi, const char *channel_nam
        if (!ch || !ch->enabled)
                return;
 
-       memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+       memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
        analog.channels = g_slist_append(analog.channels, ch);
        analog.num_samples = 1;
        analog.mq = mq;
        analog.unit = unit;
        analog.data = &value;
 
-       packet.type = SR_DF_ANALOG;
+       packet.type = SR_DF_ANALOG_OLD;
        packet.payload = &analog;
        sr_session_send(devc->session_cb_data, &packet);
        g_slist_free(analog.channels);
 }
 
-static void teleinfo_handle_mesurement(struct sr_dev_inst *sdi,
-                                       const char *label, const char *data,
-                                       char *optarif)
+static void teleinfo_handle_measurement(struct sr_dev_inst *sdi,
+               const char *label, const char *data, char *optarif)
 {
        struct dev_context *devc;
        int v = atoi(data);
@@ -135,7 +135,7 @@ static gboolean teleinfo_parse_group(struct sr_dev_inst *sdi,
                return FALSE;
        if (!teleinfo_control_check(label, data, control))
                return FALSE;
-       teleinfo_handle_mesurement(sdi, label, data, optarif);
+       teleinfo_handle_measurement(sdi, label, data, optarif);
        return TRUE;
 }