struct context {
unsigned int num_enabled_channels;
- unsigned int unitsize;
uint64_t samplerate;
- GString *header;
char separator;
+ gboolean header_done;
+ int *channel_index;
};
/*
struct context *ctx;
struct sr_channel *ch;
GSList *l;
- GVariant *gvar;
- int num_channels;
- time_t t;
-
- if (!o)
- return SR_ERR_ARG;
+ int i;
- if (!o->sdi)
+ if (!o || !o->sdi)
return SR_ERR_ARG;
- ctx = g_try_malloc0(sizeof(struct context));
+ ctx = g_malloc0(sizeof(struct context));
o->internal = ctx;
+ ctx->separator = ',';
/* Get the number of channels, and the unitsize. */
for (l = o->sdi->channels; l; l = l->next) {
continue;
ctx->num_enabled_channels++;
}
+ ctx->channel_index = g_malloc(sizeof(int) * ctx->num_enabled_channels);
- ctx->unitsize = (ctx->num_enabled_channels + 7) / 8;
-
- num_channels = g_slist_length(o->sdi->channels);
+ /* Once more to map the enabled channels. */
+ for (i = 0, l = o->sdi->channels; l; l = l->next) {
+ ch = l->data;
+ if (ch->type != SR_CHANNEL_LOGIC)
+ continue;
+ if (!ch->enabled)
+ continue;
+ ctx->channel_index[i++] = ch->index;
+ }
- 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);
- } else
- ctx->samplerate = 0;
+ return SR_OK;
+}
- ctx->separator = ',';
- ctx->header = g_string_sized_new(512);
+static GString *gen_header(struct sr_output *o)
+{
+ struct context *ctx;
+ struct sr_channel *ch;
+ GVariant *gvar;
+ GString *header;
+ GSList *l;
+ time_t t;
+ int num_channels, i;
+ char *samplerate_s;
- t = time(NULL);
+ ctx = o->internal;
+ header = g_string_sized_new(512);
/* Some metadata */
- g_string_append_printf(ctx->header, "; CSV, generated by %s on %s",
- PACKAGE_STRING, ctime(&t));
- g_string_append_printf(ctx->header, "; Samplerate: %"PRIu64"\n",
- ctx->samplerate);
+ t = time(NULL);
+ g_string_append_printf(header, "; CSV, generated by %s on %s",
+ PACKAGE_STRING, ctime(&t));
/* Columns / channels */
- g_string_append_printf(ctx->header, "; Channels (%d/%d):",
- ctx->num_enabled_channels, num_channels);
- for (l = o->sdi->channels; l; l = l->next) {
+ num_channels = g_slist_length(o->sdi->channels);
+ g_string_append_printf(header, "; Channels (%d/%d):",
+ ctx->num_enabled_channels, num_channels);
+ for (i = 0, l = o->sdi->channels; l; l = l->next, i++) {
ch = l->data;
if (ch->type != SR_CHANNEL_LOGIC)
continue;
if (!ch->enabled)
continue;
- g_string_append_printf(ctx->header, " %s,", ch->name);
+ g_string_append_printf(header, " %s,", ch->name);
}
if (o->sdi->channels)
/* Drop last separator. */
- g_string_truncate(ctx->header, ctx->header->len - 1);
- g_string_append_printf(ctx->header, "\n");
+ g_string_truncate(header, header->len - 1);
+ g_string_append_printf(header, "\n");
+
+ if (ctx->samplerate == 0) {
+ 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 (ctx->samplerate != 0) {
+ samplerate_s = sr_samplerate_string(ctx->samplerate);
+ g_string_append_printf(header, "; Samplerate: %s\n", samplerate_s);
+ g_free(samplerate_s);
+ }
- return SR_OK;
+ return header;
}
-static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
- const struct sr_datafeed_packet *packet, GString **out)
+static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
+ GString **out)
{
+ const struct sr_datafeed_meta *meta;
const struct sr_datafeed_logic *logic;
+ const struct sr_config *src;
+ GSList *l;
struct context *ctx;
+ int idx;
uint64_t i, j;
gchar *p, c;
- (void)sdi;
-
*out = NULL;
if (!o || !o->sdi)
return SR_ERR_ARG;
return SR_ERR_ARG;
switch (packet->type) {
+ case SR_DF_META:
+ meta = packet->payload;
+ for (l = meta->config; l; l = l->next) {
+ src = l->data;
+ if (src->key != SR_CONF_SAMPLERATE)
+ continue;
+ ctx->samplerate = g_variant_get_uint64(src->data);
+ }
+ break;
case SR_DF_LOGIC:
logic = packet->payload;
- if (ctx->header) {
- /*
- * First data packet: prime the output with the
- * previously prepared header.
- */
- *out = ctx->header;
- ctx->header = NULL;
+ if (!ctx->header_done) {
+ *out = gen_header(o);
+ ctx->header_done = TRUE;
} else {
*out = g_string_sized_new(512);
}
- for (i = 0; i <= logic->length - ctx->unitsize; i += ctx->unitsize) {
+ for (i = 0; i <= logic->length - logic->unitsize; i += logic->unitsize) {
for (j = 0; j < ctx->num_enabled_channels; j++) {
- p = logic->data + i + j / 8;
- c = *p & (1 << (j % 8));
+ idx = ctx->channel_index[j];
+ p = logic->data + i + idx / 8;
+ c = *p & (1 << (idx % 8));
g_string_append_c(*out, c ? '1' : '0');
g_string_append_c(*out, ctx->separator);
}
g_string_append_printf(*out, "\n");
}
break;
- case SR_DF_END:
- g_free(o->internal);
- o->internal = NULL;
- break;
}
return SR_OK;
if (o->internal) {
ctx = o->internal;
- if (ctx->header)
- g_string_free(ctx->header, TRUE);
+ g_free(ctx->channel_index);
g_free(o->internal);
o->internal = NULL;
}
SR_PRIV struct sr_output_format output_csv = {
.id = "csv",
.description = "Comma-separated values (CSV)",
- .df_type = SR_DF_LOGIC,
.init = init,
.receive = receive,
.cleanup = cleanup,
projects / libsigrok.git / blobdiff