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

diff --git a/output/output.c b/output/output.c
index aa817d9d8438723ddff50551c1e042365d5bdc28..6ab9becadb0c4940f359a30727933ce151c30a5b 100644 (file)
--- a/output/output.c
+++ b/output/output.c
@@ -19,14 +19,14 @@
 
 #include "sigrok.h"
 
-extern struct output_format output_text_binary;
+extern struct output_format output_text_bits;
 extern struct output_format output_text_hex;
 extern struct output_format output_binary;
 extern struct output_format output_vcd;
 extern struct output_format output_gnuplot;
 
 struct output_format *output_module_list[] = {
-       &output_text_binary,
+       &output_text_bits,
        &output_text_hex,
        &output_binary,
        &output_vcd,

diff --git a/output/output_text.c b/output/output_text.c
index a549e1f6b4053e061c1b209eaaba92be49b35fb1..8719f789f123b3b9996de04d3dd1515df17d30fe 100644 (file)
--- a/output/output_text.c
+++ b/output/output_text.c
@@ -23,8 +23,8 @@
 #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 {
        unsigned int num_enabled_probes;
@@ -135,15 +135,15 @@ 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;
        unsigned int outsize, offset, p;
@@ -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);
 
 }
 
@@ -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 = {
+struct output_format output_text_bits = {
        "bits",
        "Text (bits)",
-       init_binary,
-       data_binary,
+       init_bits,
+       data_bits,
        event
 };