BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Uwe Hermann 2010-04-12 23:21:12 +02:00
parent 1c5b9d302c
commit 02076d69f9
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
output/output.c
View File

@ -19,14 +19,14 @@
#include "sigrok.h" #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_text_hex;
extern struct output_format output_binary; extern struct output_format output_binary;
extern struct output_format output_vcd; extern struct output_format output_vcd;
extern struct output_format output_gnuplot; extern struct output_format output_gnuplot;
struct output_format *output_module_list[] = { struct output_format *output_module_list[] = {
&output_text_binary, &output_text_bits,
&output_text_hex, &output_text_hex,
&output_binary, &output_binary,
&output_vcd, &output_vcd,

16
output/output_text.c
View File

@ -23,7 +23,7 @@
#include <glib.h> #include <glib.h>
#include <sigrok.h> #include <sigrok.h>
#define DEFAULT_BPL_BIN 64 #define DEFAULT_BPL_BITS 64
#define DEFAULT_BPL_HEX 256 #define DEFAULT_BPL_HEX 256
struct context { struct context {
@ -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; struct context *ctx;
unsigned int outsize, offset, p; 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) 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", "bits",
"Text (bits)", "Text (bits)",
init_binary, init_bits,
data_binary, data_bits,
event event
}; };