sr: add new analog output module

[libsigrok.git] / output / output.c

diff --git a/output/output.c b/output/output.c
index 6631855159444330beafa9364fe7cd797f18bebf..cb5826b2efa74f409c006bb3a804fdf4bd3cc933 100644 (file)
--- a/output/output.c
+++ b/output/output.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 extern SR_PRIV struct sr_output_format output_text_bits;
 extern SR_PRIV struct sr_output_format output_text_hex;
@@ -29,7 +29,8 @@ extern SR_PRIV struct sr_output_format output_ols;
 extern SR_PRIV struct sr_output_format output_gnuplot;
 extern SR_PRIV struct sr_output_format output_chronovu_la8;
 extern SR_PRIV struct sr_output_format output_csv;
-/* extern SR_PRIV struct sr_output_format output_analog_bits; */
+extern SR_PRIV struct sr_output_format output_float;
+extern SR_PRIV struct sr_output_format output_analog;
 /* extern SR_PRIV struct sr_output_format output_analog_gnuplot; */
 
 static struct sr_output_format *output_module_list[] = {
@@ -42,7 +43,8 @@ static struct sr_output_format *output_module_list[] = {
        &output_gnuplot,
        &output_chronovu_la8,
        &output_csv,
-       /* &output_analog_bits, */
+       &output_float,
+       &output_analog,
        /* &output_analog_gnuplot, */
        NULL,
 };