X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput.c;h=6664ed724f21d91e717c1a09be855d066c301380;hb=77b454421a2aa7d52873f036e5ba5f8030fe29a3;hp=55199eba7681da22b1aa682020792eba0ba31029;hpb=408e719989d0b4d4408439bf84b87edea8ce85d6;p=libsigrok.git diff --git a/output/output.c b/output/output.c index 55199eba..6664ed72 100644 --- a/output/output.c +++ b/output/output.c @@ -19,22 +19,30 @@ #include -extern struct output_format output_text_bits; -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[] = { +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; }