X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fvcd.c;h=43020029ba7ab511d4e0c36437afa85e7c061b19;hb=58ffcf97121453fb53e885338e23e54c7ed78659;hp=479f331cd838b2d5763029a32b0e221e46e75ee9;hpb=a755b0e122105d934c4e7b97435420eda6df6e8e;p=libsigrok.git
diff --git a/src/output/vcd.c b/src/output/vcd.c
index 479f331c..43020029 100644
--- a/src/output/vcd.c
+++ b/src/output/vcd.c
@@ -15,22 +15,20 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
+#include
#include
#include
#include
-#include "config.h" /* Needed for PACKAGE and others. */
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#define LOG_PREFIX "output/vcd"
struct context {
int num_enabled_channels;
- GArray *channelindices;
uint8_t *prevsample;
gboolean header_done;
int period;
@@ -39,9 +37,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;
@@ -66,7 +61,7 @@ static int init(struct sr_output *o, GHashTable *options)
}
ctx = g_malloc0(sizeof(struct context));
- o->internal = ctx;
+ o->priv = ctx;
ctx->num_enabled_channels = num_enabled_channels;
ctx->channel_index = g_malloc(sizeof(int) * ctx->num_enabled_channels);
@@ -94,7 +89,7 @@ static GString *gen_header(const struct sr_output *o)
int num_channels, i;
char *samplerate_s, *frequency_s, *timestamp;
- ctx = o->internal;
+ ctx = o->priv;
header = g_string_sized_new(512);
num_channels = g_slist_length(o->sdi->channels);
@@ -107,7 +102,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);
@@ -133,12 +128,12 @@ static GString *gen_header(const struct sr_output *o)
ctx->period = SR_MHZ(1);
else
ctx->period = SR_KHZ(1);
- frequency_s = sr_period_string(ctx->period);
+ frequency_s = sr_period_string(1, ctx->period);
g_string_append_printf(header, "$timescale %s $end\n", frequency_s);
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++) {
@@ -170,9 +165,9 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
gboolean timestamp_written;
*out = NULL;
- if (!o || !o->internal)
+ if (!o || !o->priv)
return SR_ERR_BUG;
- ctx = o->internal;
+ ctx = o->priv;
switch (packet->type) {
case SR_DF_META:
@@ -251,10 +246,10 @@ static int cleanup(struct sr_output *o)
{
struct context *ctx;
- if (!o || !o->internal)
+ if (!o || !o->priv)
return SR_ERR_ARG;
- ctx = o->internal;
+ ctx = o->priv;
g_free(ctx->prevsample);
g_free(ctx->channel_index);
g_free(ctx);
@@ -266,6 +261,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,