X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput.c;h=6664ed724f21d91e717c1a09be855d066c301380;hb=120b259ea8f17b74deca3ba4b71e78771539bde8;hp=87cb86568ff346cc65481e1a818c59585a5a000e;hpb=a1bb33afbde769156ad4bef7a60579da64aebbb7;p=libsigrok.git

diff --git a/output/output.c b/output/output.c
index 87cb8656..6664ed72 100644
--- a/output/output.c
+++ b/output/output.c
@@ -17,24 +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;
-
-
-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,
-	NULL
+	&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;
 }
-
-