Disable analog bits/gnuplot output for now.

diff --git a/output/Makefile.am b/output/Makefile.am
index 510ecb794ae49ea379a587fe94cd13ca94853d29..112ebe724e0aa97a61c27d11c7f8296a784acf6e 100644 (file)
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -25,13 +25,14 @@ libsigrokoutput_la_SOURCES = \
        output_vcd.c \
        output_ols.c \
        output_gnuplot.c \
-       output_analog.c \
        text/text.c \
        text/bits.c \
        text/hex.c \
        text/ascii.c \
        output.c
 
+# Temporarily disabled: output_analog.c
+
 libsigrokoutput_la_CFLAGS = \
        -I$(top_srcdir)/libsigrok
 

diff --git a/output/output.c b/output/output.c
index b95cda77466c0fb45daa7f5a614c36dafb486a0e..6664ed724f21d91e717c1a09be855d066c301380 100644 (file)
--- a/output/output.c
+++ b/output/output.c
@@ -26,8 +26,8 @@ extern struct sr_output_format output_binary;
 extern struct sr_output_format output_vcd;
 extern struct sr_output_format output_ols;
 extern struct sr_output_format output_gnuplot;
-extern struct sr_output_format output_analog_bits;
-extern struct sr_output_format output_analog_gnuplot;
+/* extern struct sr_output_format output_analog_bits; */
+/* extern struct sr_output_format output_analog_gnuplot; */
 
 static struct sr_output_format *output_module_list[] = {
        &output_text_bits,
@@ -37,8 +37,8 @@ static struct sr_output_format *output_module_list[] = {
        &output_vcd,
        &output_ols,
        &output_gnuplot,
-       &output_analog_bits,
-       &output_analog_gnuplot,
+       /* &output_analog_bits, */
+       /* &output_analog_gnuplot, */
        NULL,
 };
 

diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c
index bf98bf152680344764bcc01b6be1a16aac9fe97b..18e7631811d36ebf352148d1823cd560aba8feed 100644 (file)
--- a/output/output_gnuplot.c
+++ b/output/output_gnuplot.c
@@ -191,6 +191,17 @@ static int data(struct sr_output *o, char *data_in, uint64_t length_in,
        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)
 {
        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;
 }
 
-struct sr_output_format output_gnuplot = {
-       "gnuplot",
-       "Gnuplot",
-       SR_DF_LOGIC,
-       init,
-       data,
-       event,
-};
-
 struct sr_output_format output_analog_gnuplot = {
        "analog_gnuplot",
        "Gnuplot analog",
@@ -343,3 +345,4 @@ struct sr_output_format output_analog_gnuplot = {
        analog_data,
        event,
 };
+#endif