-#include "sigrok.h"
-
-extern struct output_format output_text_binary;
-extern struct output_format output_text_hex;
-
-
-struct output_format *output_module_list[] = {
- &output_text_binary,
+#include <sigrok.h>
+
+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,