Add sr_ prefix for analog stuff some structs.

[libsigrok.git] / output / output_gnuplot.c

diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c
index 440e848c8c1d59bcb7e91b7733841a40797e81d6..10b9c2647eea6bab64595cd6c2a77f0c5d298a29 100644 (file)
--- a/output/output_gnuplot.c
+++ b/output/output_gnuplot.c
@@ -49,7 +49,7 @@ const char *gnuplot_header_comment = "\
 static int init(struct sr_output *o)
 {
        struct context *ctx;
-       struct probe *probe;
+       struct sr_probe *probe;
        GSList *l;
        uint64_t samplerate;
        unsigned int i;
@@ -79,7 +79,7 @@ static int init(struct sr_output *o)
 
        num_probes = g_slist_length(o->device->probes);
        comment[0] = '\0';
-       if (o->device->plugin && device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
+       if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
                samplerate = *((uint64_t *) o->device->plugin->get_device_info(
                                o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
                if (!(frequency_s = sr_samplerate_string(samplerate))) {
@@ -191,10 +191,21 @@ static int data(struct sr_output *o, char *data_in, uint64_t length_in,
        return SR_OK;
 }
 
+struct sr_output_format output_gnuplot = {
+       "gnuplot",
+       "Gnuplot",
+       SR_DF_LOGIC,
+       init,
+       data,
+       event,
+};
+
+/* Temporarily disabled. */
+#if 0
 static int analog_init(struct sr_output *o)
 {
        struct context *ctx;
-       struct probe *probe;
+       struct sr_probe *probe;
        GSList *l;
        uint64_t samplerate;
        unsigned int i;
@@ -221,12 +232,12 @@ static int analog_init(struct sr_output *o)
        }
        ctx->probelist[ctx->num_enabled_probes] = 0;
 //     ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
-       ctx->unitsize = sizeof(struct analog_sample) +
-                       (ctx->num_enabled_probes * sizeof(struct analog_probe));
+       ctx->unitsize = sizeof(struct sr_analog_sample) +
+                       (ctx->num_enabled_probes * sizeof(struct sr_analog_probe));
 
        num_probes = g_slist_length(o->device->probes);
        comment[0] = '\0';
-       if (o->device->plugin && device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
+       if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
                samplerate = *((uint64_t *) o->device->plugin->get_device_info(
                                o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
                if (!(frequency_s = sr_samplerate_string(samplerate))) {
@@ -274,7 +285,7 @@ static int analog_data(struct sr_output *o, char *data_in, uint64_t length_in,
 //     uint64_t sample;
        static uint64_t samplecount = 0;
        char *outbuf, *c;
-       struct analog_sample *sample;
+       struct sr_analog_sample *sample;
 
        ctx = o->internal;
 //     max_linelen = 16 + ctx->num_enabled_probes * 2;
@@ -296,7 +307,7 @@ static int analog_data(struct sr_output *o, char *data_in, uint64_t length_in,
 
        for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) {
 //             memcpy(&sample, data_in + i, ctx->unitsize);
-               sample = (struct analog_sample *) (data_in + i);
+               sample = (struct sr_analog_sample *) (data_in + i);
 
                /* The first column is a counter (needed for gnuplot). */
                c = outbuf + strlen(outbuf);
@@ -326,15 +337,6 @@ static int analog_data(struct sr_output *o, char *data_in, uint64_t length_in,
        return SR_OK;
 }
 
-struct sr_output_format output_gnuplot = {
-       "gnuplot",
-       "Gnuplot",
-       SR_DF_LOGIC,
-       init,
-       data,
-       event,
-};
-
 struct sr_output_format output_analog_gnuplot = {
        "analog_gnuplot",
        "Gnuplot analog",
@@ -343,3 +345,4 @@ struct sr_output_format output_analog_gnuplot = {
        analog_data,
        event,
 };
+#endif