sr: Mark API functions with SR_API/SR_PRIV.

[libsigrok.git] / output / text / text.c

diff --git a/output/text/text.c b/output/text/text.c
index 8a8e66ad9b00776bb186347709baa9dbe6d26a24..ad3e91d0e1856d52af4d9866bc52f85360510662 100644 (file)
--- a/output/text/text.c
+++ b/output/text/text.c
@@ -22,11 +22,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
 #include "config.h"
+#include "sigrok.h"
 #include "text.h"
 
-
 void flush_linebufs(struct context *ctx, char *outbuf)
 {
        static int max_probename_len = 0;
@@ -64,10 +63,10 @@ void flush_linebufs(struct context *ctx, char *outbuf)
        memset(ctx->linebuf, 0, i * ctx->linebuf_len);
 }
 
-int init(struct output *o, int default_spl, enum outputmode mode)
+int init(struct sr_output *o, int default_spl, enum outputmode mode)
 {
        struct context *ctx;
-       struct probe *probe;
+       struct sr_probe *probe;
        GSList *l;
        uint64_t samplerate;
        int num_probes;
@@ -107,10 +106,10 @@ int init(struct output *o, int default_spl, enum outputmode mode)
 
        snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
        num_probes = g_slist_length(o->device->probes);
-       if (o->device->plugin) {
+       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, DI_CUR_SAMPLERATE));
-               if (!(samplerate_s = sigrok_samplerate_string(samplerate))) {
+                               o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
+               if (!(samplerate_s = sr_samplerate_string(samplerate))) {
                        free(ctx->header);
                        free(ctx);
                        return SR_ERR;
@@ -137,7 +136,7 @@ int init(struct output *o, int default_spl, enum outputmode mode)
        return SR_OK;
 }
 
-int event(struct output *o, int event_type, char **data_out,
+int event(struct sr_output *o, int event_type, char **data_out,
                 uint64_t *length_out)
 {
        struct context *ctx;
@@ -146,12 +145,12 @@ int event(struct output *o, int event_type, char **data_out,
 
        ctx = o->internal;
        switch (event_type) {
-       case DF_TRIGGER:
+       case SR_DF_TRIGGER:
                ctx->mark_trigger = ctx->spl_cnt;
                *data_out = NULL;
                *length_out = 0;
                break;
-       case DF_END:
+       case SR_DF_END:
                outsize = ctx->num_enabled_probes
                                * (ctx->samples_per_line + 20) + 512;
                if (!(outbuf = calloc(1, outsize)))
@@ -170,4 +169,3 @@ int event(struct output *o, int event_type, char **data_out,
 
        return SR_OK;
 }
-