Rename "bin" output module to "bits" everywhere.

[libsigrok.git] / output / output_text.c

diff --git a/output/output_text.c b/output/output_text.c
index c4b9c95daa9c886e1bd36d449868489e61d8c08d..8719f789f123b3b9996de04d3dd1515df17d30fe 100644 (file)
--- a/output/output_text.c
+++ b/output/output_text.c
@@ -23,13 +23,13 @@
 #include <glib.h>
 #include <sigrok.h>
 
-#define DEFAULT_BPL_BIN 64
-#define DEFAULT_BPL_HEX 256
+#define DEFAULT_BPL_BITS 64
+#define DEFAULT_BPL_HEX  256
 
 struct context {
-       int num_enabled_probes;
+       unsigned int num_enabled_probes;
        int samples_per_line;
-       int unitsize;
+       unsigned int unitsize;
        int line_offset;
        int linebuf_len;
        char *probelist[65];
@@ -40,7 +40,7 @@ struct context {
 };
 
 
-static void flush_linebufs(struct context *ctx, GSList *probes, char *outbuf)
+static void flush_linebufs(struct context *ctx, char *outbuf)
 {
        static int max_probename_len = 0;
        int len, i;
@@ -123,7 +123,7 @@ static int event(struct output *o, int event_type, char **data_out, uint64_t *le
        case DF_END:
                outsize = ctx->num_enabled_probes * (ctx->samples_per_line + 20) + 512;
                outbuf = calloc(1, outsize);
-               flush_linebufs(ctx, o->device->probes, outbuf);
+               flush_linebufs(ctx, outbuf);
                *data_out = outbuf;
                *length_out = strlen(outbuf);
                free(o->internal);
@@ -135,18 +135,18 @@ static int event(struct output *o, int event_type, char **data_out, uint64_t *le
 }
 
 
-static int init_binary(struct output *o)
+static int init_bits(struct output *o)
 {
 
-       return init(o, DEFAULT_BPL_BIN);
+       return init(o, DEFAULT_BPL_BITS);
 
 }
 
 
-static int data_binary(struct output *o, char *data_in, uint64_t length_in, char **data_out, uint64_t *length_out)
+static int data_bits(struct output *o, char *data_in, uint64_t length_in, char **data_out, uint64_t *length_out)
 {
        struct context *ctx;
-       int outsize, offset, p;
+       unsigned int outsize, offset, p;
        uint64_t sample;
        char *outbuf;
 
@@ -183,7 +183,7 @@ static int data_binary(struct output *o, char *data_in, uint64_t length_in, char
 
                        /* end of line */
                        if(ctx->spl_cnt >= ctx->samples_per_line) {
-                               flush_linebufs(ctx, o->device->probes, outbuf);
+                               flush_linebufs(ctx, outbuf);
                                ctx->line_offset = ctx->spl_cnt = 0;
                        }
                }
@@ -200,7 +200,7 @@ static int data_binary(struct output *o, char *data_in, uint64_t length_in, char
 static int init_hex(struct output *o)
 {
 
-       return init(o, DEFAULT_BPL_BIN);
+       return init(o, DEFAULT_BPL_BITS);
 
 }
 
@@ -208,7 +208,7 @@ static int init_hex(struct output *o)
 static int data_hex(struct output *o, char *data_in, uint64_t length_in, char **data_out, uint64_t *length_out)
 {
        struct context *ctx;
-       int outsize, offset, p;
+       unsigned int outsize, offset, p;
        uint64_t sample;
        char *outbuf;
 
@@ -244,7 +244,7 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in, char **
 
                /* end of line */
                if(ctx->spl_cnt >= ctx->samples_per_line) {
-                       flush_linebufs(ctx, o->device->probes, outbuf);
+                       flush_linebufs(ctx, outbuf);
                        ctx->line_offset = ctx->spl_cnt = 0;
                }
        }
@@ -257,11 +257,11 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in, char **
 
 
 
-struct output_format output_text_binary = {
-       "bin",
-       "Text (binary)",
-       init_binary,
-       data_binary,
+struct output_format output_text_bits = {
+       "bits",
+       "Text (bits)",
+       init_bits,
+       data_bits,
        event
 };