X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fgnuplot.c;h=32369610a958064b4a3721acc00c2d9c7faab24c;hb=c09f0b578c0e9c03590cb814f66004bb3f6815ff;hp=c150a2fb4eba514223ce24343807ec032df4bc83;hpb=2285cf9bc519edb88eccbe3bf2ddd6888e54cdf2;p=libsigrok.git diff --git a/output/gnuplot.c b/output/gnuplot.c index c150a2fb..32369610 100644 --- a/output/gnuplot.c +++ b/output/gnuplot.c @@ -71,8 +71,8 @@ static int init(struct sr_output *o) return SR_ERR_ARG; } - if (!o->dev->plugin) { - sr_err("gnuplot out: %s: o->dev->plugin was NULL", __func__); + if (!o->dev->driver) { + sr_err("gnuplot out: %s: o->dev->driver was NULL", __func__); return SR_ERR_ARG; } @@ -101,8 +101,8 @@ static int init(struct sr_output *o) num_probes = g_slist_length(o->dev->probes); comment[0] = '\0'; if (sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) { - samplerate = *((uint64_t *) o->dev->plugin->dev_info_get( - o->dev->plugin_index, SR_DI_CUR_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))) { sr_err("gnuplot out: %s: sr_samplerate_string failed", __func__); @@ -320,9 +320,9 @@ static int analog_init(struct sr_output *o) num_probes = g_slist_length(o->dev->probes); comment[0] = '\0'; - if (o->dev->plugin && sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) { - samplerate = *((uint64_t *) o->dev->plugin->dev_info_get( - o->dev->plugin_index, SR_DI_CUR_SAMPLERATE)); + if (o->dev->driver && 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))) { g_free(ctx->header); g_free(ctx);