saleae-logic16: Detect the hardware.

[libsigrok.git] / input / vcd.c

diff --git a/input/vcd.c b/input/vcd.c
index 5bb1f677b7c527ad0c6107960ec4b9af2e154117..b39793824c30e711f9398a1f14fafda702a5151c 100644 (file)
--- a/input/vcd.c
+++ b/input/vcd.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Petteri Aimonen <jpa@sr.mail.kapsi.fi>
  *
@@ -64,14 +64,14 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "input/vcd: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "input/vcd: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 #define DEFAULT_NUM_PROBES 8
 
@@ -173,18 +173,20 @@ struct context
        int downsample;
        unsigned compress;
        int64_t skip;
-       struct probe probes[SR_MAX_NUM_PROBES];
+       GSList *probes;
 };
 
+static void free_probe(void *data)
+{
+       struct probe *probe = data;
+       g_free(probe->name);
+       g_free(probe->identifier);
+       g_free(probe);
+}
+
 static void release_context(struct context *ctx)
 {
-       int i;
-       for (i = 0; i < ctx->probecount; i++)
-       {
-               g_free(ctx->probes[i].name); ctx->probes[i].name = NULL;
-               g_free(ctx->probes[i].identifier); ctx->probes[i].identifier = NULL;
-       }
-       
+       g_slist_free_full(ctx->probes, free_probe);
        g_free(ctx);
 }
 
@@ -211,8 +213,10 @@ static void remove_empty_parts(gchar **parts)
  */
 static gboolean parse_header(FILE *file, struct context *ctx)
 {
+       uint64_t p, q;
        gchar *name = NULL, *contents = NULL;
        gboolean status = FALSE;
+       struct probe *probe;
 
        while (parse_section(file, &name, &contents))
        {
@@ -227,15 +231,14 @@ static gboolean parse_header(FILE *file, struct context *ctx)
                {
                        /* The standard allows for values 1, 10 or 100
                         * and units s, ms, us, ns, ps and fs. */
-                       struct sr_rational period;
-                       if (sr_parse_period(contents, &period) == SR_OK)
+                       if (sr_parse_period(contents, &p, &q) == SR_OK)
                        {
-                               ctx->samplerate = period.q / period.p;
-                               if (period.q % period.p != 0)
+                               ctx->samplerate = q / p;
+                               if (q % p != 0)
                                {
                                        /* Does not happen unless time value is non-standard */
                                        sr_warn("Inexact rounding of samplerate, %" PRIu64 " / %" PRIu64 " to %" PRIu64 " Hz.",
-                                               period.q, period.p, ctx->samplerate);
+                                               q, p, ctx->samplerate);
                                }
                                
                                sr_dbg("Samplerate: %" PRIu64, ctx->samplerate);
@@ -270,8 +273,10 @@ static gboolean parse_header(FILE *file, struct context *ctx)
                        else
                        {
                                sr_info("Probe %d is '%s' identified by '%s'.", ctx->probecount, parts[3], parts[2]);
-                               ctx->probes[ctx->probecount].identifier = g_strdup(parts[2]);
-                               ctx->probes[ctx->probecount].name = g_strdup(parts[3]);
+                               probe = g_malloc(sizeof(struct probe));
+                               probe->identifier = g_strdup(parts[2]);
+                               probe->name = g_strdup(parts[3]);
+                               ctx->probes = g_slist_append(ctx->probes, probe);
                                ctx->probecount++;
                        }
                        
@@ -311,7 +316,7 @@ static int format_match(const char *filename)
        return status;
 }
 
-static int init(struct sr_input *in)
+static int init(struct sr_input *in, const char *filename)
 {
        struct sr_probe *probe;
        int num_probes, i;
@@ -319,6 +324,8 @@ static int init(struct sr_input *in)
        char *param;
        struct context *ctx;
 
+       (void)filename;
+
        if (!(ctx = g_try_malloc0(sizeof(*ctx)))) {
                sr_err("Input format context malloc failed.");
                return SR_ERR_MALLOC;
@@ -497,6 +504,9 @@ static void parse_contents(FILE *file, const struct sr_dev_inst *sdi, struct con
                {
                        /* A new 1-bit sample value */
                        int i, bit;
+                       GSList *l;
+                       struct probe *probe;
+
                        bit = (token->str[0] == '1');
                
                        g_string_erase(token, 0, 1);
@@ -509,9 +519,11 @@ static void parse_contents(FILE *file, const struct sr_dev_inst *sdi, struct con
                                read_until(file, token, 'W');
                        }
                        
-                       for (i = 0; i < ctx->probecount; i++)
+                       for (i = 0, l = ctx->probes; i < ctx->probecount && l; i++, l = l->next)
                        {
-                               if (g_strcmp0(token->str, ctx->probes[i].identifier) == 0)
+                               probe = l->data;
+
+                               if (g_strcmp0(token->str, probe->identifier) == 0)
                                {
                                        sr_dbg("Probe %d new value %d.", i, bit);
                                
@@ -543,7 +555,6 @@ static void parse_contents(FILE *file, const struct sr_dev_inst *sdi, struct con
 
 static int loadfile(struct sr_input *in, const char *filename)
 {
-       struct sr_datafeed_header header;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_meta meta;
        struct sr_config *src;
@@ -564,19 +575,16 @@ static int loadfile(struct sr_input *in, const char *filename)
        }
 
        /* Send header packet to the session bus. */
-       header.feed_version = 1;
-       gettimeofday(&header.starttime, NULL);
-       packet.type = SR_DF_HEADER;
-       packet.payload = &header;
-       sr_session_send(in->sdi, &packet);
+       std_session_send_df_header(in->sdi, LOG_PREFIX);
 
        /* Send metadata about the SR_DF_LOGIC packets to come. */
        packet.type = SR_DF_META;
        packet.payload = &meta;
        samplerate = ctx->samplerate / ctx->downsample;
-       src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&samplerate);
+       src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(samplerate));
        meta.config = g_slist_append(NULL, src);
        sr_session_send(in->sdi, &packet);
+       sr_config_free(src);
 
        /* Parse the contents of the VCD file */
        parse_contents(file, in->sdi, ctx);