X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput.c;h=471ee9c79f7997263eaebdba952718484977aa5c;hb=6f4b1868e8ec8c132878d8b6d558f4af054cbd91;hp=e04b33906dbd394e0e457e1306a3b1c87bd80dfe;hpb=cd315a80d87a24a19a7846497d74c5ca85d494a0;p=libsigrok.git diff --git a/output/output.c b/output/output.c index e04b3390..471ee9c7 100644 --- a/output/output.c +++ b/output/output.c @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2010 Bert Vermeulen + * Copyright (C) 2010-2012 Bert Vermeulen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,19 +17,20 @@ * along with this program. If not, see . */ -#include "sigrok.h" +#include "libsigrok.h" +#include "libsigrok-internal.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_chronovu_la8; -extern struct sr_output_format output_csv; -/* extern struct sr_output_format output_analog_bits; */ -/* extern struct sr_output_format output_analog_gnuplot; */ +extern SR_PRIV struct sr_output_format output_text_bits; +extern SR_PRIV struct sr_output_format output_text_hex; +extern SR_PRIV struct sr_output_format output_text_ascii; +extern SR_PRIV struct sr_output_format output_binary; +extern SR_PRIV struct sr_output_format output_vcd; +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_float; +/* extern SR_PRIV struct sr_output_format output_analog_gnuplot; */ static struct sr_output_format *output_module_list[] = { &output_text_bits, @@ -41,12 +42,12 @@ static struct sr_output_format *output_module_list[] = { &output_gnuplot, &output_chronovu_la8, &output_csv, - /* &output_analog_bits, */ + &output_float, /* &output_analog_gnuplot, */ NULL, }; -struct sr_output_format **sr_output_list(void) +SR_API struct sr_output_format **sr_output_list(void) { return output_module_list; }