/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
*
struct context {
unsigned int num_enabled_probes;
unsigned int unitsize;
- char *probelist[SR_MAX_NUM_PROBES + 1];
uint64_t samplerate;
GString *header;
char separator;
struct context *ctx;
struct sr_probe *probe;
GSList *l;
+ GVariant *gvar;
int num_probes;
- uint64_t *samplerate;
time_t t;
- unsigned int i;
if (!o) {
sr_err("%s: o was NULL", __func__);
o->internal = ctx;
- /* Get the number of probes, their names, and the unitsize. */
+ /* Get the number of probes, and the unitsize. */
for (l = o->sdi->probes; l; l = l->next) {
probe = l->data;
- if (!probe->enabled)
- continue;
- ctx->probelist[ctx->num_enabled_probes++] = probe->name;
+ if (probe->enabled)
+ ctx->num_enabled_probes++;
}
- ctx->probelist[ctx->num_enabled_probes] = 0;
+
ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
num_probes = g_slist_length(o->sdi->probes);
- if (sr_dev_has_hwcap(o->sdi, SR_CONF_SAMPLERATE)) {
- o->sdi->driver->config_get(SR_CONF_SAMPLERATE,
- (const void **)&samplerate, o->sdi);
- ctx->samplerate = *samplerate;
+ if (sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
+ o->sdi->driver->config_get(SR_CONF_SAMPLERATE, &gvar, o->sdi);
+ ctx->samplerate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
} else
ctx->samplerate = 0;
/* Columns / channels */
g_string_append_printf(ctx->header, "; Channels (%d/%d): ",
ctx->num_enabled_probes, num_probes);
- for (i = 0; i < ctx->num_enabled_probes; i++)
- g_string_append_printf(ctx->header, "%s, ", ctx->probelist[i]);
+ for (l = o->sdi->probes; l; l = l->next) {
+ probe = l->data;
+ if (probe->enabled)
+ g_string_append_printf(ctx->header, "%s, ", probe->name);
+ }
g_string_append_printf(ctx->header, "\n");
return SR_OK;