X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput.c;h=a7e26d9c13d34bf83aff9a01ad6a37dfa0f36164;hb=bd47acabe33813acb7dd6a4ebf155418072b08b7;hp=9bda9893851576e616defa73e0163e3741963e15;hpb=e2ad47b5b0ad98fc99579d4cd9ebee7db2a03d82;p=libsigrok.git

diff --git a/output/output.c b/output/output.c
index 9bda9893..a7e26d9c 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
@@ -18,21 +18,36 @@
  */
 
 #include "sigrok.h"
+#include "sigrok-internal.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 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_float;
+/* extern SR_PRIV 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_float,
+	/* &output_analog_gnuplot, */
 	NULL,
 };
 
-struct output_format **output_list(void)
+SR_API struct sr_output_format **sr_output_list(void)
 {
 	return output_module_list;
 }