Pass unitsize to srd_session_send() directly.

[sigrok-cli.git] / decode.c

diff --git a/decode.c b/decode.c
index 2e831f74ee1985a735e3da027a933ea2d3328bca..e2a0f8563524447982d19f71381bb9fa99c01fef 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -19,9 +19,9 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <glib.h>
 #include "sigrok-cli.h"
 #include "config.h"
-#include <glib.h>
 
 #ifdef HAVE_SRD
 static GHashTable *pd_ann_visible = NULL;
@@ -109,7 +109,8 @@ static GHashTable *extract_channel_map(struct srd_decoder *dec, GHashTable *hash
        return channel_map;
 }
 
-/* Register the given PDs for this session.
+/*
+ * Register the given PDs for this session.
  * Accepts a string of the form: "spi:sck=3:sdata=4,spi:sck=3:sdata=5"
  * That will instantiate two SPI decoders on the clock but different data
  * lines.
@@ -180,7 +181,8 @@ int register_pds(const char *opt_pds, char *opt_pd_annotations)
                        channels = NULL;
                }
 
-               /* If no annotation list was specified, add them all in now.
+               /*
+                * If no annotation list was specified, add them all in now.
                 * This will be pared down later to leave only the last PD
                 * in the stack.
                 */
@@ -196,8 +198,7 @@ int register_pds(const char *opt_pds, char *opt_pd_annotations)
                g_hash_table_destroy(options);
        if (channels)
                g_hash_table_destroy(channels);
-       if (pd_name)
-               g_free(pd_name);
+       g_free(pd_name);
 
        return ret;
 }
@@ -213,7 +214,6 @@ static void map_pd_inst_channels(void *key, void *value, void *user_data)
        void *channel_target;
        struct sr_channel *ch;
        GHashTableIter iter;
-       int num_channels;
 
        channel_map = value;
        channel_list = user_data;
@@ -244,8 +244,7 @@ static void map_pd_inst_channels(void *key, void *value, void *user_data)
                g_hash_table_insert(channel_indices, g_strdup(channel_id), var);
        }
 
-       num_channels = g_slist_length(channel_list);
-       srd_inst_channel_set_all(di, channel_indices, (num_channels + 7) / 8);
+       srd_inst_channel_set_all(di, channel_indices);
 }
 
 void map_pd_channels(struct sr_dev_inst *sdi)
@@ -305,7 +304,8 @@ int setup_pd_stack(char *opt_pds, char *opt_pd_stack, char *opt_pd_annotations)
                        if ((ret = srd_inst_stack(srd_sess, di_from, di_to)) != SRD_OK)
                                return 1;
 
-                       /* Don't show annotation from this PD. Only the last PD in
+                       /*
+                        * Don't show annotation from this PD. Only the last PD in
                         * the stack will be left on the annotation list (unless
                         * the annotation list was specifically provided).
                         */
@@ -453,7 +453,6 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
        char **ann_descr;
        gboolean show;
 
-       /* 'cb_data' is not used in this specific callback. */
        (void)cb_data;
 
        if (!pd_ann_visible)
@@ -500,8 +499,6 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 
 void show_pd_meta(struct srd_proto_data *pdata, void *cb_data)
 {
-
-       /* 'cb_data' is not used in this specific callback. */
        (void)cb_data;
 
        if (!g_hash_table_lookup_extended(pd_meta_visible,
@@ -523,7 +520,6 @@ void show_pd_binary(struct srd_proto_data *pdata, void *cb_data)
        gpointer classp;
        int class;
 
-       /* 'cb_data' is not used in this specific callback. */
        (void)cb_data;
 
        if (!g_hash_table_lookup_extended(pd_binary_visible,
@@ -542,4 +538,3 @@ void show_pd_binary(struct srd_proto_data *pdata, void *cb_data)
        fflush(stdout);
 }
 #endif
-