X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput.c;h=b95cda77466c0fb45daa7f5a614c36dafb486a0e;hb=f50f3f40d9238b0c50be67e52bc132aadfcf2050;hp=63da6352a2de8d80727ee06e8d30f6804880b5b8;hpb=4c9ffa83cf5b63445a1463af18a910a8cc786e31;p=libsigrok.git
diff --git a/output/output.c b/output/output.c
index 63da6352..b95cda77 100644
--- a/output/output.c
+++ b/output/output.c
@@ -17,26 +17,32 @@
* along with this program. If not, see .
*/
-#include "sigrok.h"
-
-extern struct output_format output_text_binary;
-extern struct output_format output_text_hex;
-extern struct output_format output_vcd;
-
-
-struct output_format *output_module_list[] = {
- &output_text_binary,
+#include
+
+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,
+ &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;
}
-
-