X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=output%2Foutput.c;h=d5b769daf9b1b1ae3e014d0e41c3802dfe6f1b27;hb=2d83e0f963b39104ba065c61ef22456adcf15a8d;hp=9bda9893851576e616defa73e0163e3741963e15;hpb=e2ad47b5b0ad98fc99579d4cd9ebee7db2a03d82;p=libsigrok.git

diff --git a/output/output.c b/output/output.c
index 9bda9893..d5b769da 100644
--- a/output/output.c
+++ b/output/output.c
@@ -17,22 +17,36 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok.h"
+#include <sigrok.h>
 
-extern struct output_format output_text_binary;
-extern struct output_format output_text_hex;
-extern struct output_format output_vcd;
-extern struct output_format output_gnuplot;
+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_chronovu_la8;
+extern struct sr_output_format output_csv;
+/* extern struct sr_output_format output_analog_bits; */
+/* extern struct sr_output_format output_analog_gnuplot; */
 
-struct output_format *output_module_list[] = {
-	&output_text_binary,
+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_chronovu_la8,
+	&output_csv,
+	/* &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;
 }