output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / input / logicport.c

diff --git a/src/input/logicport.c b/src/input/logicport.c
index 273b25d2049a45ce9b4689158be8e1fef01d644c..ea4cb39b252bb406aaf31bcb4a343128ed2dab9b 100644 (file)
--- a/src/input/logicport.c
+++ b/src/input/logicport.c
@@ -60,10 +60,6 @@
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
-/* TODO: Move these helpers to some library API routine group. */
-struct sr_channel_group *sr_channel_group_new(const char *name, void *priv);
-void sr_channel_group_free(struct sr_channel_group *cg);
-
 #define LOG_PREFIX     "input/logicport"
 
 #define MAX_CHANNELS   34
@@ -155,26 +151,6 @@ static void free_signal_group(struct signal_group_desc *desc)
        g_free(desc);
 }
 
-struct sr_channel_group *sr_channel_group_new(const char *name, void *priv)
-{
-       struct sr_channel_group *cg;
-
-       cg = g_malloc0(sizeof(*cg));
-       if (name && *name)
-               cg->name = g_strdup(name);
-       cg->priv = priv;
-
-       return cg;
-}
-
-void sr_channel_group_free(struct sr_channel_group *cg)
-{
-       if (!cg)
-               return;
-       g_free(cg->name);
-       g_slist_free(cg->channels);
-}
-
 /* Wrapper for GDestroyNotify compatibility. */
 static void sg_free(void *p)
 {
@@ -767,8 +743,8 @@ static int parse_header(struct sr_input *in)
        return SR_OK;
 }
 
-/* Create sigrok channels and groups. Allocate the session feed buffer. */
-static int create_channels_groups_buffer(struct sr_input *in)
+/* Create sigrok channels and groups. */
+static int create_channels_groups(struct sr_input *in)
 {
        struct context *inc;
        uint64_t mask;
@@ -783,6 +759,9 @@ static int create_channels_groups_buffer(struct sr_input *in)
 
        inc = in->priv;
 
+       if (inc->channels)
+               return SR_OK;
+
        mask = UINT64_C(1);
        for (idx = 0; idx < inc->channel_count; idx++, mask <<= 1) {
                name = inc->signal_names[idx];
@@ -799,10 +778,9 @@ static int create_channels_groups_buffer(struct sr_input *in)
        sdi = in->sdi;
        for (l = inc->signal_groups; l; l = l->next) {
                desc = l->data;
-               cg = sr_channel_group_new(desc->name, NULL);
+               cg = sr_channel_group_new(sdi, desc->name, NULL);
                if (!cg)
                        return SR_ERR_MALLOC;
-               sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
                mask = UINT64_C(1);
                for (idx = 0; idx < inc->channel_count; idx++, mask <<= 1) {
                        if (!(desc->mask & mask))
@@ -814,6 +792,16 @@ static int create_channels_groups_buffer(struct sr_input *in)
                }
        }
 
+       return SR_OK;
+}
+
+/* Allocate the session feed buffer. */
+static int create_feed_buffer(struct sr_input *in)
+{
+       struct context *inc;
+
+       inc = in->priv;
+
        inc->unitsize = (inc->channel_count + 7) / 8;
        inc->samples_per_chunk = CHUNK_SIZE / inc->unitsize;
        inc->samples_in_buffer = 0;
@@ -829,8 +817,6 @@ static int send_buffer(struct sr_input *in)
 {
        struct context *inc;
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_meta meta;
-       struct sr_config *src;
        struct sr_datafeed_logic logic;
        int rc;
 
@@ -846,14 +832,8 @@ static int send_buffer(struct sr_input *in)
        }
 
        if (inc->sample_rate && !inc->rate_sent) {
-               packet.type = SR_DF_META;
-               packet.payload = &meta;
-               src = sr_config_new(SR_CONF_SAMPLERATE,
+               rc = sr_session_send_meta(in->sdi, SR_CONF_SAMPLERATE,
                        g_variant_new_uint64(inc->sample_rate));
-               meta.config = g_slist_append(NULL, src);
-               rc = sr_session_send(in->sdi, &packet);
-               g_slist_free(meta.config);
-               sr_config_free(src);
                if (rc)
                        return rc;
                inc->rate_sent = TRUE;
@@ -1004,7 +984,10 @@ static int prepare_session_feed(struct sr_input *in)
         * header to the session. Optionally send the sample
         * rate before sample data will be sent.
         */
-       rc = create_channels_groups_buffer(in);
+       rc = create_channels_groups(in);
+       if (rc)
+               return rc;
+       rc = create_feed_buffer(in);
        if (rc)
                return rc;
 
@@ -1133,7 +1116,8 @@ static void cleanup(struct sr_input *in)
         * and scalars, so that re-runs start out fresh again.
         */
        g_free(inc->sw_version);
-       g_string_free(inc->cont_buff, TRUE);
+       if (inc->cont_buff)
+               g_string_free(inc->cont_buff, TRUE);
        g_free(inc->sample_data_queue);
        for (idx = 0; idx < inc->channel_count; idx++)
                g_free(inc->wire_names[idx]);
@@ -1148,13 +1132,21 @@ static void cleanup(struct sr_input *in)
 static int reset(struct sr_input *in)
 {
        struct context *inc;
+       GSList *channels;
 
        inc = in->priv;
+
+       /*
+        * The input module's .reset() routine clears the 'inc' context,
+        * but 'in' is kept which contains channel groups which reference
+        * channels. Since we cannot re-create the channels (applications
+        * don't expect us to, see bug #1215), make sure to keep the
+        * channels across the reset operation.
+        */
+       channels = inc->channels;
+       inc->channels = NULL;
        cleanup(in);
-       inc->ch_feed_prep = FALSE;
-       inc->header_sent = FALSE;
-       inc->rate_sent = FALSE;
-       g_string_truncate(in->buf, 0);
+       inc->channels = channels;
 
        return SR_OK;
 }