sr/drivers: use sr_dev_inst instead of device index for dev_config_set()

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

diff --git a/output/text/text.c b/output/text/text.c
index a2ae5265d9069e0c92f39d581b17b043117c728b..c48743218991f3c533b99e25237c23b8a96ae43b 100644 (file)
--- a/output/text/text.c
+++ b/output/text/text.c
@@ -23,11 +23,11 @@
 #include <string.h>
 #include <glib.h>
 #include "config.h"
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "text.h"
 
-SR_PRIV void flush_linebufs(struct context *ctx, char *outbuf)
+SR_PRIV void flush_linebufs(struct context *ctx, uint8_t *outbuf)
 {
        static int max_probename_len = 0;
        int len, i;
@@ -45,7 +45,8 @@ SR_PRIV void flush_linebufs(struct context *ctx, char *outbuf)
        }
 
        for (i = 0; ctx->probelist[i]; i++) {
-               sprintf(outbuf + strlen(outbuf), "%*s:%s\n", max_probename_len,
+               sprintf((char *)outbuf + strlen((const char *)outbuf),
+                       "%*s:%s\n", max_probename_len,
                        ctx->probelist[i], ctx->linebuf + i * ctx->linebuf_len);
        }
 
@@ -57,8 +58,8 @@ SR_PRIV void flush_linebufs(struct context *ctx, char *outbuf)
                if (ctx->mode == MODE_ASCII)
                        space_offset = 0;
 
-               sprintf(outbuf + strlen(outbuf), "T:%*s^\n",
-                       ctx->mark_trigger + space_offset, "");
+               sprintf((char *)outbuf + strlen((const char *)outbuf),
+                       "T:%*s^\n", ctx->mark_trigger + space_offset, "");
        }
 
        memset(ctx->linebuf, 0, i * ctx->linebuf_len);
@@ -110,9 +111,9 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
 
        snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
        num_probes = g_slist_length(o->dev->probes);
-       if (o->dev->plugin || sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
-               samplerate = *((uint64_t *) o->dev->plugin->get_dev_info(
-                               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 (!(samplerate_s = sr_samplerate_string(samplerate))) {
                        g_free(ctx->header);
                        g_free(ctx);
@@ -142,12 +143,12 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
        return SR_OK;
 }
 
-SR_PRIV int event(struct sr_output *o, int event_type, char **data_out,
+SR_PRIV int event(struct sr_output *o, int event_type, uint8_t **data_out,
                  uint64_t *length_out)
 {
        struct context *ctx;
        int outsize;
-       char *outbuf;
+       uint8_t *outbuf;
 
        ctx = o->internal;
        switch (event_type) {
@@ -165,7 +166,7 @@ SR_PRIV int event(struct sr_output *o, int event_type, char **data_out,
                }
                flush_linebufs(ctx, outbuf);
                *data_out = outbuf;
-               *length_out = strlen(outbuf);
+               *length_out = strlen((const char *)outbuf);
                g_free(o->internal);
                o->internal = NULL;
                break;