#define LOG_PREFIX "output/csv"
struct context {
- unsigned int num_enabled_probes;
- unsigned int unitsize;
+ unsigned int num_enabled_channels;
uint64_t samplerate;
GString *header;
char separator;
+ int *channel_index;
};
/*
* - Option to (not) print samplenumber / time as extra column.
* - Option to "compress" output (only print changed samples, VCD-like).
* - Option to print comma-separated bits, or whole bytes/words (for 8/16
- * probe LAs) as ASCII/hex etc. etc.
+ * channel LAs) as ASCII/hex etc. etc.
* - Trigger support.
*/
static int init(struct sr_output *o)
{
struct context *ctx;
- struct sr_probe *probe;
+ struct sr_channel *ch;
GSList *l;
GVariant *gvar;
- int num_probes;
+ int num_channels, i, j;
time_t t;
if (!o)
if (!o->sdi)
return SR_ERR_ARG;
- ctx = g_try_malloc0(sizeof(struct context));
+ ctx = g_malloc0(sizeof(struct context));
o->internal = ctx;
- /* Get the number of probes, and the unitsize. */
- for (l = o->sdi->probes; l; l = l->next) {
- probe = l->data;
- if (probe->type != SR_PROBE_LOGIC)
+ /* Get the number of channels, and the unitsize. */
+ for (l = o->sdi->channels; l; l = l->next) {
+ ch = l->data;
+ if (ch->type != SR_CHANNEL_LOGIC)
continue;
- if (!probe->enabled)
+ if (!ch->enabled)
continue;
- ctx->num_enabled_probes++;
+ ctx->num_enabled_channels++;
}
+ ctx->channel_index = g_malloc(sizeof(int) * ctx->num_enabled_channels);
- ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
-
- num_probes = g_slist_length(o->sdi->probes);
+ num_channels = g_slist_length(o->sdi->channels);
if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
&gvar) == SR_OK) {
/* Columns / channels */
g_string_append_printf(ctx->header, "; Channels (%d/%d):",
- ctx->num_enabled_probes, num_probes);
- for (l = o->sdi->probes; l; l = l->next) {
- probe = l->data;
- if (probe->type != SR_PROBE_LOGIC)
+ ctx->num_enabled_channels, num_channels);
+ for (i = 0, j = 0, l = o->sdi->channels; l; l = l->next, i++) {
+ ch = l->data;
+ if (ch->type != SR_CHANNEL_LOGIC)
continue;
- if (!probe->enabled)
+ if (!ch->enabled)
continue;
- g_string_append_printf(ctx->header, " %s,", probe->name);
+ g_string_append_printf(ctx->header, " %s,", ch->name);
+ /* Remember the enabled channel's index while we're at it. */
+ ctx->channel_index[j++] = i;
}
- if (o->sdi->probes)
+ if (o->sdi->channels)
/* Drop last separator. */
g_string_truncate(ctx->header, ctx->header->len - 1);
g_string_append_printf(ctx->header, "\n");
{
const struct sr_datafeed_logic *logic;
struct context *ctx;
+ int idx;
uint64_t i, j;
gchar *p, c;
*out = g_string_sized_new(512);
}
- for (i = 0; i <= logic->length - ctx->unitsize; i += ctx->unitsize) {
- for (j = 0; j < ctx->num_enabled_probes; j++) {
- p = logic->data + i + j / 8;
- c = *p & (1 << (j % 8));
+ for (i = 0; i <= logic->length - logic->unitsize; i += logic->unitsize) {
+ for (j = 0; j < ctx->num_enabled_channels; j++) {
+ 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;
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,