X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput.c;h=91fdf3884d52c0e134a86526cf51d962c5c82226;hb=d55c89f523e74a2f629bb23e8fd9bf6db7e3758a;hp=63da6352a2de8d80727ee06e8d30f6804880b5b8;hpb=4c9ffa83cf5b63445a1463af18a910a8cc786e31;p=libsigrok.git

diff --git a/output/output.c b/output/output.c
index 63da6352..91fdf388 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 <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * 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,26 +17,55 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
-extern struct output_format output_text_binary;
-extern struct output_format output_text_hex;
-extern struct output_format output_vcd;
+/**
+ * @file
+ *
+ * Output file/data format handling.
+ */
+
+/**
+ * @defgroup grp_output Output formats
+ *
+ * Output file/data format handling.
+ *
+ * @{
+ */
 
+/** @cond PRIVATE */
+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_analog;
+/* extern SR_PRIV struct sr_output_format output_analog_gnuplot; */
+/* @endcond */
 
-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_chronovu_la8,
+	&output_csv,
+	&output_analog,
+	/* &output_analog_gnuplot, */
 	NULL,
 };
 
-
-
-struct output_format **output_list(void)
+SR_API struct sr_output_format **sr_output_list(void)
 {
-
 	return output_module_list;
 }
 
-
+/** @} */