/*
- * 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 trigger_point;
uint64_t samplerate;
};
struct context *ctx;
struct sr_probe *probe;
GSList *l;
- uint64_t *samplerate;
+ GVariant *gvar;
if (!o) {
sr_warn("%s: o was NULL", __func__);
return SR_ERR_ARG;
}
- if (!o->sdi->driver) {
- sr_warn("%s: o->sdi->driver was NULL", __func__);
- return SR_ERR_ARG;
- }
-
if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
sr_warn("%s: ctx malloc failed", __func__);
return SR_ERR_MALLOC;
o->internal = ctx;
- /* Get the probe names and the unitsize. */
+ /* Get 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;
+ ctx->num_enabled_probes++;
}
- ctx->probelist[ctx->num_enabled_probes] = 0;
ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
- if (sr_dev_has_hwcap(o->sdi, SR_HWCAP_SAMPLERATE)) {
- o->sdi->driver->info_get(SR_DI_CUR_SAMPLERATE,
- (const void **)&samplerate, o->sdi);
- ctx->samplerate = *samplerate;
+ if (sr_config_get(o->sdi->driver, SR_CONF_SAMPLERATE, &gvar,
+ o->sdi) == SR_OK) {
+ ctx->samplerate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
} else
ctx->samplerate = 0;