X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=output%2Foutput.c;h=b95cda77466c0fb45daa7f5a614c36dafb486a0e;hb=a65de0309b0629d8a5f744f4be7bad67fdd5c34e;hp=9bda9893851576e616defa73e0163e3741963e15;hpb=e2ad47b5b0ad98fc99579d4cd9ebee7db2a03d82;p=libsigrok.git
diff --git a/output/output.c b/output/output.c
index 9bda9893..b95cda77 100644
--- a/output/output.c
+++ b/output/output.c
@@ -17,22 +17,32 @@
* along with this program. If not, see .
*/
-#include "sigrok.h"
+#include
-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_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;
}