config.h usage cleanups.

[libsigrok.git] / output / gnuplot.c

diff --git a/output/gnuplot.c b/output/gnuplot.c
index c150a2fb4eba514223ce24343807ec032df4bc83..6e0e745f7b74d7f9bfefa98dc11d061c2afb1531 100644 (file)
--- a/output/gnuplot.c
+++ b/output/gnuplot.c
@@ -21,9 +21,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h"
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "config.h" /* Needed for PACKAGE_STRING and others. */
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 struct context {
        unsigned int num_enabled_probes;
@@ -54,7 +54,7 @@ static int init(struct sr_output *o)
        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;
@@ -66,13 +66,13 @@ static int init(struct sr_output *o)
                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->plugin) {
-               sr_err("gnuplot out: %s: o->dev->plugin was NULL", __func__);
+       if (!o->sdi->driver) {
+               sr_err("gnuplot out: %s: o->sdi->driver was NULL", __func__);
                return SR_ERR_ARG;
        }
 
@@ -89,7 +89,7 @@ static int init(struct sr_output *o)
 
        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;
@@ -98,12 +98,12 @@ static int init(struct sr_output *o)
        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->plugin->dev_info_get(
-                               o->dev->plugin_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);
@@ -118,11 +118,11 @@ static int init(struct sr_output *o)
        /* Columns / channels */
        wbuf[0] = '\0';
        for (i = 0; i < ctx->num_enabled_probes; i++) {
-               c = (char *)&wbuf + strlen((char *)&wbuf);
+               c = (char *)&wbuf + strlen((const char *)&wbuf);
                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);
@@ -145,7 +145,7 @@ static int init(struct sr_output *o)
        return 0;
 }
 
-static int event(struct sr_output *o, int event_type, char **data_out,
+static int event(struct sr_output *o, int event_type, uint8_t **data_out,
                 uint64_t *length_out)
 {
        if (!o) {
@@ -183,14 +183,14 @@ static int event(struct sr_output *o, int event_type, char **data_out,
        return SR_OK;
 }
 
-static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
-               char **data_out, uint64_t *length_out)
+static int data(struct sr_output *o, const uint8_t *data_in,
+               uint64_t length_in, uint8_t **data_out, uint64_t *length_out)
 {
        struct context *ctx;
        unsigned int max_linelen, outsize, p, curbit, i;
        uint64_t sample;
        static uint64_t samplecount = 0, old_sample = 0;
-       char *outbuf, *c;
+       uint8_t *outbuf, *c;
 
        if (!o) {
                sr_err("gnuplot out: %s: o was NULL", __func__);
@@ -231,7 +231,7 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
        outbuf[0] = '\0';
        if (ctx->header) {
                /* The header is still here, this must be the first packet. */
-               strncpy(outbuf, ctx->header, outsize);
+               strncpy((char *)outbuf, ctx->header, outsize);
                g_free(ctx->header);
                ctx->header = NULL;
        }
@@ -251,22 +251,22 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
                old_sample = sample;
 
                /* The first column is a counter (needed for gnuplot). */
-               c = outbuf + strlen(outbuf);
-               sprintf(c, "%" PRIu64 "\t", samplecount++);
+               c = outbuf + strlen((const char *)outbuf);
+               sprintf((char *)c, "%" PRIu64 "\t", samplecount++);
 
                /* The next columns are the values of all channels. */
                for (p = 0; p < ctx->num_enabled_probes; p++) {
                        curbit = (sample & ((uint64_t) (1 << p))) >> p;
-                       c = outbuf + strlen(outbuf);
-                       sprintf(c, "%d ", curbit);
+                       c = outbuf + strlen((const char *)outbuf);
+                       sprintf((char *)c, "%d ", curbit);
                }
 
-               c = outbuf + strlen(outbuf);
-               sprintf(c, "\n");
+               c = outbuf + strlen((const char *)outbuf);
+               sprintf((char *)c, "\n");
        }
 
        *data_out = outbuf;
-       *length_out = strlen(outbuf);
+       *length_out = strlen((const char *)outbuf);
 
        return SR_OK;
 }
@@ -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);
@@ -360,14 +360,15 @@ static int analog_init(struct sr_output *o)
        return 0;
 }
 
-static int analog_data(struct sr_output *o, char *data_in, uint64_t length_in,
-               char **data_out, uint64_t *length_out)
+static int analog_data(struct sr_output *o, uint8_t *data_in,
+                      uint64_t length_in, uint8_t **data_out,
+                      uint64_t *length_out)
 {
        struct context *ctx;
        unsigned int max_linelen, outsize, p, /* curbit, */ i;
 //     uint64_t sample;
        static uint64_t samplecount = 0;
-       char *outbuf, *c;
+       uint8_t *outbuf, *c;
        struct sr_analog_sample *sample;
 
        ctx = o->internal;