analog: use SI prefix only with units that accept SI prefixes

[libsigrok.git] / src / output / vcd.c

diff --git a/src/output/vcd.c b/src/output/vcd.c
index 9d5ca8807a41bf5668fb33a3bb5b92e420d5c496..33eeeb51443acc6903715989b1f68bced81323eb 100644 (file)
--- a/src/output/vcd.c
+++ b/src/output/vcd.c
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h" /* Needed for PACKAGE and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/vcd"
@@ -39,9 +39,6 @@ struct context {
        uint64_t samplecount;
 };
 
-static const char *const vcd_header_comment =
-       "$comment\n  Acquisition with %d/%d channels at %s\n$end\n";
-
 static int init(struct sr_output *o, GHashTable *options)
 {
        struct context *ctx;
@@ -107,7 +104,7 @@ static GString *gen_header(const struct sr_output *o)
 
        /* generator */
        g_string_append_printf(header, "$version %s %s $end\n",
-                       PACKAGE, PACKAGE_VERSION);
+                       PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
        g_string_append_printf(header, "$comment\n  Acquisition with "
                        "%d/%d channels", ctx->num_enabled_channels, num_channels);
 
@@ -138,7 +135,7 @@ static GString *gen_header(const struct sr_output *o)
        g_free(frequency_s);
 
        /* scope */
-       g_string_append_printf(header, "$scope module %s $end\n", PACKAGE);
+       g_string_append_printf(header, "$scope module %s $end\n", PACKAGE_NAME);
 
        /* Wires / channels */
        for (i = 0, l = o->sdi->channels; l; l = l->next, i++) {
@@ -266,6 +263,8 @@ struct sr_output_module output_vcd = {
        .id = "vcd",
        .name = "VCD",
        .desc = "Value Change Dump",
+       .exts = (const char*[]){"vcd", NULL},
+       .flags = 0,
        .options = NULL,
        .init = init,
        .receive = receive,