X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput.c;h=6631855159444330beafa9364fe7cd797f18bebf;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=6cadd86b934df2766b0fd3805a5896a475952e18;hpb=81bbdf6a6a2a8651e3c1ab3a7f714a851da77141;p=libsigrok.git

diff --git a/output/output.c b/output/output.c
index 6cadd86b..66318551 100644
--- a/output/output.c
+++ b/output/output.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,19 +17,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <sigrok.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
-extern struct output_format output_text_bits;
-extern struct output_format output_text_hex;
-extern struct output_format output_text_ascii;
-extern struct output_format output_binary;
-extern struct output_format output_vcd;
-extern struct output_format output_ols;
-extern struct output_format output_gnuplot;
-extern struct output_format output_analog_bits;
-extern struct output_format output_analog_gnuplot;
+extern SR_PRIV struct sr_output_format output_text_bits;
+extern SR_PRIV struct sr_output_format output_text_hex;
+extern SR_PRIV struct sr_output_format output_text_ascii;
+extern SR_PRIV struct sr_output_format output_binary;
+extern SR_PRIV struct sr_output_format output_vcd;
+extern SR_PRIV struct sr_output_format output_ols;
+extern SR_PRIV struct sr_output_format output_gnuplot;
+extern SR_PRIV struct sr_output_format output_chronovu_la8;
+extern SR_PRIV struct sr_output_format output_csv;
+/* extern SR_PRIV struct sr_output_format output_analog_bits; */
+/* extern SR_PRIV struct sr_output_format output_analog_gnuplot; */
 
-struct output_format *output_module_list[] = {
+static struct sr_output_format *output_module_list[] = {
 	&output_text_bits,
 	&output_text_hex,
 	&output_text_ascii,
@@ -37,12 +40,14 @@ struct output_format *output_module_list[] = {
 	&output_vcd,
 	&output_ols,
 	&output_gnuplot,
-	&output_analog_bits,
-	&output_analog_gnuplot,
+	&output_chronovu_la8,
+	&output_csv,
+	/* &output_analog_bits, */
+	/* &output_analog_gnuplot, */
 	NULL,
 };
 
-struct output_format **output_list(void)
+SR_API struct sr_output_format **sr_output_list(void)
 {
 	return output_module_list;
 }