Add sr_ prefix to input/output structs.

[libsigrok.git] / output / output.c

diff --git a/output/output.c b/output/output.c
index aa817d9d8438723ddff50551c1e042365d5bdc28..b95cda77466c0fb45daa7f5a614c36dafb486a0e 100644 (file)
--- a/output/output.c
+++ b/output/output.c
@@ -17,24 +17,32 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok.h"
+#include <sigrok.h>
 
-extern struct output_format output_text_binary;
-extern struct output_format output_text_hex;
-extern struct output_format output_binary;
-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;
 }