X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=output%2Fvcd.c;h=59198357dfa204663ec03aa8faea7c1818495e4d;hp=e1661e5c08cfc7367eecfd63315638f4f9fe9d32;hb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;hpb=d5585e32dd856b09d78acab2aac3ba6c78ad7752 diff --git a/output/vcd.c b/output/vcd.c index e1661e5c..59198357 100644 --- a/output/vcd.c +++ b/output/vcd.c @@ -1,8 +1,8 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2010 Uwe Hermann - * Copyright (C) 2010-2012 Bert Vermeulen + * Copyright (C) 2013 Bert Vermeulen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,35 +26,29 @@ #include "libsigrok.h" #include "libsigrok-internal.h" -/* Message logging helpers with driver-specific prefix string. */ -#define DRIVER_LOG_DOMAIN "output/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) +#define LOG_PREFIX "output/vcd" struct context { - int num_enabled_probes; - char *probelist[SR_MAX_NUM_PROBES + 1]; - int *prevbits; + int num_enabled_channels; + GArray *channelindices; GString *header; - uint64_t prevsample; + uint8_t *prevsample; int period; uint64_t samplerate; + uint64_t samplecount; + unsigned int unitsize; }; -static const char *vcd_header_comment = "\ -$comment\n Acquisition with %d/%d probes at %s\n$end\n"; +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) { struct context *ctx; - struct sr_probe *probe; + struct sr_channel *ch; GSList *l; - uint64_t *samplerate; - int num_probes, i; + GVariant *gvar; + int num_channels, i; char *samplerate_s, *frequency_s, *timestamp; time_t t; @@ -64,22 +58,27 @@ static int init(struct sr_output *o) } o->internal = ctx; - ctx->num_enabled_probes = 0; + ctx->num_enabled_channels = 0; + ctx->channelindices = g_array_new(FALSE, FALSE, sizeof(int)); - for (l = o->sdi->probes; l; l = l->next) { - probe = l->data; - if (!probe->enabled) + for (l = o->sdi->channels; l; l = l->next) { + ch = l->data; + if (ch->type != SR_PROBE_LOGIC) continue; - ctx->probelist[ctx->num_enabled_probes++] = probe->name; + if (!ch->enabled) + continue; + ctx->channelindices = g_array_append_val( + ctx->channelindices, ch->index); + ctx->num_enabled_channels++; } - if (ctx->num_enabled_probes > 94) { - sr_err("VCD only supports 94 probes."); + if (ctx->num_enabled_channels > 94) { + sr_err("VCD only supports 94 channels."); return SR_ERR; } - ctx->probelist[ctx->num_enabled_probes] = 0; + ctx->unitsize = (ctx->num_enabled_channels + 7) / 8; ctx->header = g_string_sized_new(512); - num_probes = g_slist_length(o->sdi->probes); + num_channels = g_slist_length(o->sdi->channels); /* timestamp */ t = time(NULL); @@ -92,17 +91,17 @@ static int init(struct sr_output *o) g_string_append_printf(ctx->header, "$version %s %s $end\n", PACKAGE, PACKAGE_VERSION); - if (o->sdi->driver && sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) { - o->sdi->driver->config_get(SR_CONF_SAMPLERATE, - (const void **)&samplerate, o->sdi); - ctx->samplerate = *samplerate; + if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE, + &gvar) == SR_OK) { + ctx->samplerate = g_variant_get_uint64(gvar); + g_variant_unref(gvar); if (!((samplerate_s = sr_samplerate_string(ctx->samplerate)))) { g_string_free(ctx->header, TRUE); g_free(ctx); return SR_ERR; } g_string_append_printf(ctx->header, vcd_header_comment, - ctx->num_enabled_probes, num_probes, samplerate_s); + ctx->num_enabled_channels, num_channels, samplerate_s); g_free(samplerate_s); } @@ -126,89 +125,103 @@ static int init(struct sr_output *o) g_string_append_printf(ctx->header, "$scope module %s $end\n", PACKAGE); /* Wires / channels */ - for (i = 0; i < ctx->num_enabled_probes; i++) { + for (i = 0, l = o->sdi->channels; l; l = l->next, i++) { + ch = l->data; + if (ch->type != SR_PROBE_LOGIC) + continue; + if (!ch->enabled) + continue; g_string_append_printf(ctx->header, "$var wire 1 %c %s $end\n", - (char)('!' + i), ctx->probelist[i]); + (char)('!' + i), ch->name); } g_string_append(ctx->header, "$upscope $end\n" - "$enddefinitions $end\n$dumpvars\n"); + "$enddefinitions $end\n"); - if (!(ctx->prevbits = g_try_malloc0(sizeof(int) * num_probes))) { + if (!(ctx->prevsample = g_try_malloc0(ctx->unitsize))) { g_string_free(ctx->header, TRUE); g_free(ctx); - sr_err("%s: ctx->prevbits malloc failed", __func__); + sr_err("%s: ctx->prevsample malloc failed", __func__); return SR_ERR_MALLOC; } return SR_OK; } -static GString *recv(struct sr_output *o, const struct sr_dev_inst *sdi, - const struct sr_datafeed_packet *packet) +static int receive(struct sr_output *o, const struct sr_dev_inst *sdi, + const struct sr_datafeed_packet *packet, GString **out) { const struct sr_datafeed_logic *logic; struct context *ctx; - GString *text; unsigned int i; - int p, curbit, prevbit; - uint64_t sample; - static uint64_t samplecount = 0; - gboolean first_sample; + int p, curbit, prevbit, index; + uint8_t *sample; + gboolean timestamp_written; (void)sdi; + *out = NULL; if (!o || !o->internal) - return NULL; + return SR_ERR_BUG; ctx = o->internal; - if (packet->type == SR_DF_END) { - text = g_string_sized_new(16); - g_string_printf(text, "$dumpoff\n$end\n"); - return text; - } else if (packet->type != SR_DF_LOGIC) - return NULL; - if (ctx->header) { /* The header is still here, this must be the first packet. */ - text = ctx->header; + *out = ctx->header; ctx->header = NULL; - first_sample = TRUE; + ctx->samplecount = 0; } else { - text = g_string_sized_new(512); - first_sample = FALSE; + *out = g_string_sized_new(512); + } + + if (packet->type != SR_DF_LOGIC) { + if (packet->type == SR_DF_END) + /* Write final timestamp as length indicator. */ + g_string_append_printf(*out, "#%.0f\n", + (double)ctx->samplecount / + ctx->samplerate * ctx->period); + return SR_OK; } logic = packet->payload; for (i = 0; i <= logic->length - logic->unitsize; i += logic->unitsize) { - samplecount++; + sample = logic->data + i; + timestamp_written = FALSE; - memcpy(&sample, logic->data + i, logic->unitsize); + for (p = 0; p < ctx->num_enabled_channels; p++) { + index = g_array_index(ctx->channelindices, int, p); - if (first_sample) { - /* First packet. We neg to make sure sample is stored. */ - ctx->prevsample = ~sample; - first_sample = FALSE; - } - - for (p = 0; p < ctx->num_enabled_probes; p++) { - curbit = (sample & ((uint64_t) (1 << p))) >> p; - prevbit = (ctx->prevsample & ((uint64_t) (1 << p))) >> p; + curbit = ((unsigned)sample[index / 8] + >> (index % 8)) & 1; + prevbit = ((unsigned)ctx->prevsample[index / 8] + >> (index % 8)) & 1; /* VCD only contains deltas/changes of signals. */ - if (prevbit == curbit) + if (prevbit == curbit && ctx->samplecount > 0) continue; + /* Output timestamp of subsequent signal changes. */ + if (!timestamp_written) + g_string_append_printf(*out, "#%.0f", + (double)ctx->samplecount / + ctx->samplerate * ctx->period); + /* Output which signal changed to which value. */ - g_string_append_printf(text, "#%" PRIu64 "\n%i%c\n", - (uint64_t)(((float)samplecount / ctx->samplerate) - * ctx->period), curbit, (char)('!' + p)); + g_string_append_c(*out, ' '); + g_string_append_c(*out, '0' + curbit); + g_string_append_c(*out, '!' + p); + + timestamp_written = TRUE; } - ctx->prevsample = sample; + if (timestamp_written) + g_string_append_c(*out, '\n'); + + ctx->samplecount++; + memcpy(ctx->prevsample, sample, ctx->unitsize); } - return text; + return SR_OK; } static int cleanup(struct sr_output *o) @@ -229,6 +242,6 @@ struct sr_output_format output_vcd = { .description = "Value Change Dump (VCD)", .df_type = SR_DF_LOGIC, .init = init, - .recv = recv, - .cleanup = cleanup + .receive = receive, + .cleanup = cleanup, };