X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=module_sigrokdecode.c;h=d5172d6febf5823dd22503c6c73604b3cfaa606e;hp=a76645c582c6e205912d03d6f4299eb069551303;hb=0169f19c53e195df2f96c4df731ad3214c59e20a;hpb=53a07a6d287ecdd3a9831dd3778676edf6ee8a9e

diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c
index a76645c..d5172d6 100644
--- a/module_sigrokdecode.c
+++ b/module_sigrokdecode.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrokdecode project.
  *
  * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
@@ -17,10 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "sigrokdecode-internal.h"
+#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode-internal.h"
 #include "config.h"
 
+/** @cond PRIVATE */
+
 /* type_decoder.c */
 extern SRD_PRIV PyTypeObject srd_Decoder_type;
 
@@ -33,6 +35,8 @@ extern SRD_PRIV PyTypeObject srd_logic_type;
  */
 SRD_PRIV PyObject *mod_sigrokdecode = NULL;
 
+/** @endcond */
+
 static struct PyModuleDef sigrokdecode_module = {
 	PyModuleDef_HEAD_INIT,
 	.m_name = "sigrokdecode",
@@ -40,7 +44,7 @@ static struct PyModuleDef sigrokdecode_module = {
 	.m_size = -1,
 };
 
-/* FIXME: SRD_PRIV causes issues on MinGW. Investigate. */
+/** @cond PRIVATE */
 PyMODINIT_FUNC PyInit_sigrokdecode(void)
 {
 	PyObject *mod;
@@ -64,17 +68,21 @@ PyMODINIT_FUNC PyInit_sigrokdecode(void)
 	    (PyObject *)&srd_logic_type) == -1)
 		return NULL;
 
-	/* expose output types as symbols in the sigrokdecode module */
+	/* Expose output types as symbols in the sigrokdecode module */
 	if (PyModule_AddIntConstant(mod, "OUTPUT_ANN", SRD_OUTPUT_ANN) == -1)
 		return NULL;
-	if (PyModule_AddIntConstant(mod, "OUTPUT_PROTO",
-	    SRD_OUTPUT_PROTO) == -1)
+	if (PyModule_AddIntConstant(mod, "OUTPUT_PYTHON", SRD_OUTPUT_PYTHON) == -1)
+		return NULL;
+	if (PyModule_AddIntConstant(mod, "OUTPUT_BINARY", SRD_OUTPUT_BINARY) == -1)
+		return NULL;
+	if (PyModule_AddIntConstant(mod, "OUTPUT_META", SRD_OUTPUT_META) == -1)
 		return NULL;
-	if (PyModule_AddIntConstant(mod, "OUTPUT_BINARY",
-	    SRD_OUTPUT_BINARY) == -1)
+	/* Expose meta input symbols. */
+	if (PyModule_AddIntConstant(mod, "SRD_CONF_SAMPLERATE", SRD_CONF_SAMPLERATE) == -1)
 		return NULL;
 
 	mod_sigrokdecode = mod;
 
 	return mod;
 }
+/** @endcond */