Pass unitsize to srd_session_send() directly.

Follow an API change in libsigrokdecode where srd_inst_channel_set_all()
no longer gets passed a unitsize, but rather srd_session_send() gets it.

This allows us to avoid having to guess a unitsize based on the number
of channels (which guesses incorrectly in some cases).

This fixes (parts of) bug #352.

diff --git a/decode.c b/decode.c
index 4d584d73b87ea3439bbf744f68811f14d2d8c6ac..e2a0f8563524447982d19f71381bb9fa99c01fef 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -214,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;
        void *channel_target;
        struct sr_channel *ch;
        GHashTableIter iter;

-       int num_channels;

 
        channel_map = value;
        channel_list = user_data;
 
        channel_map = value;
        channel_list = user_data;


@@ -245,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);
        }
 
                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)
 }
 
 void map_pd_channels(struct sr_dev_inst *sdi)

diff --git a/session.c b/session.c
index b4ff3ffd9645abcd0fc081fae5e2f996bca9bcf0..7fb939948ba2b265078ecfce75bb7f267bb39516 100644 (file)
--- a/session.c
+++ b/session.c
@@ -281,7 +281,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
                if (opt_pds) {
 #ifdef HAVE_SRD
                        if (srd_session_send(srd_sess, rcvd_samples_logic, end_sample,
                if (opt_pds) {
 #ifdef HAVE_SRD
                        if (srd_session_send(srd_sess, rcvd_samples_logic, end_sample,

-                                       logic->data, input_len) != SRD_OK)
+                                       logic->data, input_len, logic->unitsize) != SRD_OK)

                                sr_session_stop(session);
 #endif
                }
                                sr_session_stop(session);
 #endif
                }