X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=output%2Fvcd.c;h=44a12dec37a8c2e2265ea499d4410d61443d5ac3;hb=5413df19528c96c6fba3ee4cc61ec3dfe01047cb;hp=98159e9f59a84fd3bf32a69910be1b9a18eba14f;hpb=bbe6e336b3baf86b43f88185f25eab424cbd61f6;p=libsigrok.git diff --git a/output/vcd.c b/output/vcd.c index 98159e9f..44a12dec 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,23 +26,16 @@ #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; + GArray *probeindices; GString *header; - uint64_t prevsample; + uint8_t *prevsample; int period; uint64_t samplerate; + unsigned int unitsize; }; static const char *vcd_header_comment = "\ @@ -53,7 +46,7 @@ static int init(struct sr_output *o) struct context *ctx; struct sr_probe *probe; GSList *l; - uint64_t *samplerate; + GVariant *gvar; int num_probes, i; char *samplerate_s, *frequency_s, *timestamp; time_t t; @@ -65,19 +58,24 @@ static int init(struct sr_output *o) o->internal = ctx; ctx->num_enabled_probes = 0; + ctx->probeindices = g_array_new(FALSE, FALSE, sizeof(int)); for (l = o->sdi->probes; l; l = l->next) { probe = l->data; + if (probe->type != SR_PROBE_LOGIC) + continue; if (!probe->enabled) continue; - ctx->probelist[ctx->num_enabled_probes++] = probe->name; + ctx->probeindices = g_array_append_val( + ctx->probeindices, probe->index); + ctx->num_enabled_probes++; } if (ctx->num_enabled_probes > 94) { sr_err("VCD only supports 94 probes."); return SR_ERR; } - ctx->probelist[ctx->num_enabled_probes] = 0; + ctx->unitsize = (ctx->num_enabled_probes + 7) / 8; ctx->header = g_string_sized_new(512); num_probes = g_slist_length(o->sdi->probes); @@ -92,10 +90,10 @@ 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); @@ -126,89 +124,85 @@ 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->probes; l; l = l->next, i++) { + probe = l->data; + if (probe->type != SR_PROBE_LOGIC) + continue; + if (!probe->enabled) + continue; g_string_append_printf(ctx->header, "$var wire 1 %c %s $end\n", - (char)('!' + i), ctx->probelist[i]); + (char)('!' + i), probe->name); } g_string_append(ctx->header, "$upscope $end\n" "$enddefinitions $end\n$dumpvars\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 *receive(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; + int p, curbit, prevbit, index; + uint8_t *sample; static uint64_t samplecount = 0; - gboolean first_sample; (void)sdi; + *out = NULL; if (!o || !o->internal) - return NULL; + return SR_ERR_ARG; 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; + *out = g_string_new("$dumpoff\n$end\n"); + return SR_OK; } else if (packet->type != SR_DF_LOGIC) - return NULL; + return SR_OK; 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; } else { - text = g_string_sized_new(512); - first_sample = FALSE; + *out = g_string_sized_new(512); } logic = packet->payload; for (i = 0; i <= logic->length - logic->unitsize; i += logic->unitsize) { samplecount++; - memcpy(&sample, logic->data + i, logic->unitsize); - - if (first_sample) { - /* First packet. We neg to make sure sample is stored. */ - ctx->prevsample = ~sample; - first_sample = FALSE; - } + sample = logic->data + i; for (p = 0; p < ctx->num_enabled_probes; p++) { - curbit = (sample & ((uint64_t) (1 << p))) >> p; - prevbit = (ctx->prevsample & ((uint64_t) (1 << p))) >> p; + index = g_array_index(ctx->probeindices, int, p); + curbit = (sample[p / 8] & (((uint8_t) 1) << index)) >> index; + prevbit = (ctx->prevsample[p / 8] & (((uint8_t) 1) << index)) >> index; /* VCD only contains deltas/changes of signals. */ if (prevbit == curbit) continue; /* Output which signal changed to which value. */ - g_string_append_printf(text, "#%" PRIu64 "\n%i%c\n", + g_string_append_printf(*out, "#%" PRIu64 "\n%i%c\n", (uint64_t)(((float)samplecount / ctx->samplerate) * ctx->period), curbit, (char)('!' + p)); } - ctx->prevsample = sample; + memcpy(ctx->prevsample, sample, ctx->unitsize); } - return text; + return SR_OK; } static int cleanup(struct sr_output *o) @@ -229,6 +223,6 @@ struct sr_output_format output_vcd = { .description = "Value Change Dump (VCD)", .df_type = SR_DF_LOGIC, .init = init, - .recv = receive, + .receive = receive, .cleanup = cleanup, };