From 77b454421a2aa7d52873f036e5ba5f8030fe29a3 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Sun, 20 Feb 2011 13:08:44 +0100
Subject: [PATCH] Disable analog bits/gnuplot output for now.

---
 output/Makefile.am      |  3 ++-
 output/output.c         |  8 ++++----
 output/output_gnuplot.c | 21 ++++++++++++---------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/output/Makefile.am b/output/Makefile.am
index 510ecb79..112ebe72 100644
--- 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 b95cda77..6664ed72 100644
--- 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 bf98bf15..18e76318 100644
--- 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