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

Disable analog bits/gnuplot output for now.

This commit is contained in:
Uwe Hermann 2011-02-20 13:08:44 +01:00
parent 29cbfeaf5c
commit 77b454421a
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
output/Makefile.am
View File

@ -25,13 +25,14 @@ libsigrokoutput_la_SOURCES = \
output_vcd.c \ output_vcd.c \
output_ols.c \ output_ols.c \
output_gnuplot.c \ output_gnuplot.c \
output_analog.c \
text/text.c \ text/text.c \
text/bits.c \ text/bits.c \
text/hex.c \ text/hex.c \
text/ascii.c \ text/ascii.c \
output.c output.c
# Temporarily disabled: output_analog.c
libsigrokoutput_la_CFLAGS = \ libsigrokoutput_la_CFLAGS = \
-I$(top_srcdir)/libsigrok -I$(top_srcdir)/libsigrok

8
output/output.c
View File

@ -26,8 +26,8 @@ extern struct sr_output_format output_binary;
extern struct sr_output_format output_vcd; extern struct sr_output_format output_vcd;
extern struct sr_output_format output_ols; extern struct sr_output_format output_ols;
extern struct sr_output_format output_gnuplot; extern struct sr_output_format output_gnuplot;
extern struct sr_output_format output_analog_bits; /* extern struct sr_output_format output_analog_bits; */
extern struct sr_output_format output_analog_gnuplot; /* extern struct sr_output_format output_analog_gnuplot; */
static struct sr_output_format *output_module_list[] = { static struct sr_output_format *output_module_list[] = {
&output_text_bits, &output_text_bits,
@ -37,8 +37,8 @@ static struct sr_output_format *output_module_list[] = {
&output_vcd, &output_vcd,
&output_ols, &output_ols,
&output_gnuplot, &output_gnuplot,
&output_analog_bits, /* &output_analog_bits, */
&output_analog_gnuplot, /* &output_analog_gnuplot, */
NULL, NULL,
}; };

21
output/output_gnuplot.c
View File

@ -191,6 +191,17 @@ static int data(struct sr_output *o, char *data_in, uint64_t length_in,
return SR_OK; return SR_OK;
} }
struct sr_output_format output_gnuplot = {
"gnuplot",
"Gnuplot",
SR_DF_LOGIC,
init,
data,
event,
};
/* Temporarily disabled. */
#if 0
static int analog_init(struct sr_output *o) static int analog_init(struct sr_output *o)
{ {
struct context *ctx; struct context *ctx;
@ -326,15 +337,6 @@ static int analog_data(struct sr_output *o, char *data_in, uint64_t length_in,
return SR_OK; return SR_OK;
} }
struct sr_output_format output_gnuplot = {
"gnuplot",
"Gnuplot",
SR_DF_LOGIC,
init,
data,
event,
};
struct sr_output_format output_analog_gnuplot = { struct sr_output_format output_analog_gnuplot = {
"analog_gnuplot", "analog_gnuplot",
"Gnuplot analog", "Gnuplot analog",
@ -343,3 +345,4 @@ struct sr_output_format output_analog_gnuplot = {
analog_data, analog_data,
event, event,
}; };
#endif