#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include "config.h"
+#include "config.h" /* Needed for PACKAGE_STRING and others. */
#include "libsigrok.h"
#include "libsigrok-internal.h"
struct context *ctx;
struct sr_probe *probe;
GSList *l;
- uint64_t samplerate;
+ uint64_t *samplerate;
unsigned int i;
int b, num_probes;
char *c, *frequency_s;
return SR_ERR_ARG;
}
- if (!o->dev) {
- sr_err("gnuplot out: %s: o->dev was NULL", __func__);
+ if (!o->sdi) {
+ sr_err("gnuplot out: %s: o->sdi was NULL", __func__);
return SR_ERR_ARG;
}
- if (!o->dev->driver) {
- sr_err("gnuplot out: %s: o->dev->driver was NULL", __func__);
+ if (!o->sdi->driver) {
+ sr_err("gnuplot out: %s: o->sdi->driver was NULL", __func__);
return SR_ERR_ARG;
}
o->internal = ctx;
ctx->num_enabled_probes = 0;
- for (l = o->dev->probes; l; l = l->next) {
+ for (l = o->sdi->probes; l; l = l->next) {
probe = l->data; /* TODO: Error checks. */
if (!probe->enabled)
continue;
ctx->probelist[ctx->num_enabled_probes] = 0;
ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
- num_probes = g_slist_length(o->dev->probes);
+ num_probes = g_slist_length(o->sdi->probes);
comment[0] = '\0';
- if (sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
- samplerate = *((uint64_t *) o->dev->driver->dev_info_get(
- o->dev->driver_index, SR_DI_CUR_SAMPLERATE));
- if (!(frequency_s = sr_samplerate_string(samplerate))) {
+ if (sr_dev_has_hwcap(o->sdi, SR_HWCAP_SAMPLERATE)) {
+ o->sdi->driver->info_get(SR_DI_CUR_SAMPLERATE,
+ (const void **)&samplerate, o->sdi);
+ if (!(frequency_s = sr_samplerate_string(*samplerate))) {
sr_err("gnuplot out: %s: sr_samplerate_string failed",
__func__);
g_free(ctx->header);
sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]);
}
- if (!(frequency_s = sr_period_string(samplerate))) {
+ if (!(frequency_s = sr_period_string(*samplerate))) {
sr_err("gnuplot out: %s: sr_period_string failed", __func__);
g_free(ctx->header);
g_free(ctx);