X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput.c;h=b95cda77466c0fb45daa7f5a614c36dafb486a0e;hb=a59606dfff0fa324e0003904a8eb72d7159c3c1f;hp=4835f2445ec78fa3282b2b245953bbb45049d073;hpb=d4f228d094d53c95bdf4dd42525a271db716928d;p=libsigrok.git

diff --git a/output/output.c b/output/output.c
index 4835f244..b95cda77 100644
--- a/output/output.c
+++ b/output/output.c
@@ -19,16 +19,17 @@
 
 #include <sigrok.h>
 
-extern struct output_format output_text_bits;
-extern struct output_format output_text_hex;
-extern struct output_format output_text_ascii;
-extern struct output_format output_binary;
-extern struct output_format output_vcd;
-extern struct output_format output_ols;
-extern struct output_format output_gnuplot;
-extern struct output_format output_analog;
+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[] = {
+static struct sr_output_format *output_module_list[] = {
 	&output_text_bits,
 	&output_text_hex,
 	&output_text_ascii,
@@ -36,11 +37,12 @@ struct output_format *output_module_list[] = {
 	&output_vcd,
 	&output_ols,
 	&output_gnuplot,
-	&output_analog,
+	&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;
 }