X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput.c;h=6664ed724f21d91e717c1a09be855d066c301380;hb=77b454421a2aa7d52873f036e5ba5f8030fe29a3;hp=aa817d9d8438723ddff50551c1e042365d5bdc28;hpb=1c5b9d302c410cdd1cba441f618e0e3f7afa137d;p=libsigrok.git

diff --git a/output/output.c b/output/output.c
index aa817d9d..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"
+#include <sigrok.h>
 
-extern struct output_format output_text_binary;
-extern struct output_format output_text_hex;
-extern struct output_format output_binary;
-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_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_analog_bits, */
+	/* &output_analog_gnuplot, */
 	NULL,
 };
 
-struct output_format **output_list(void)
+struct sr_output_format **sr_output_list(void)
 {
 	return output_module_list;
 }