X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput.c;h=6664ed724f21d91e717c1a09be855d066c301380;hb=d494a4aa9dcbd90126d86757d16fa3e0f0a419f3;hp=63da6352a2de8d80727ee06e8d30f6804880b5b8;hpb=4c9ffa83cf5b63445a1463af18a910a8cc786e31;p=libsigrok.git

diff --git a/output/output.c b/output/output.c
index 63da6352..6664ed72 100644
--- a/output/output.c
+++ b/output/output.c
@@ -17,26 +17,32 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok.h"
-
-extern struct output_format output_text_binary;
-extern struct output_format output_text_hex;
-extern struct output_format output_vcd;
-
-
-struct output_format *output_module_list[] = {
-	&output_text_binary,
+#include <sigrok.h>
+
+extern struct sr_output_format output_text_bits;
+extern struct sr_output_format output_text_hex;
+extern struct sr_output_format output_text_ascii;
+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; */
+
+static struct sr_output_format *output_module_list[] = {
+	&output_text_bits,
 	&output_text_hex,
+	&output_text_ascii,
+	&output_binary,
 	&output_vcd,
+	&output_ols,
+	&output_gnuplot,
+	/* &output_analog_bits, */
+	/* &output_analog_gnuplot, */
 	NULL,
 };
 
-
-
-struct output_format **output_list(void)
+struct sr_output_format **sr_output_list(void)
 {
-
 	return output_module_list;
 }
-
-