From: Uwe Hermann <redacted>
Date: Mon, 12 Apr 2010 21:21:12 +0000 (+0200)
Subject: Rename "bin" output module to "bits" everywhere.
X-Git-Tag: libsigrok-0.1.0~565
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=02076d69f9505bc20ce0e9f67fa131054d8baeab

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

diff --git a/output/output.c b/output/output.c
index aa817d9d..6ab9beca 100644
--- 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 a549e1f6..8719f789 100644
--- 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
 };