/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrokdecode project.
*
* Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
*
* 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-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
#include "config.h"
+/** @cond PRIVATE */
-/* lives in type_decoder.c */
-extern PyTypeObject srd_Decoder_type;
+/* type_decoder.c */
+extern SRD_PRIV PyTypeObject srd_Decoder_type;
-/* lives in type_logic.c */
-extern PyTypeObject srd_logic_type;
+/* type_logic.c */
+extern SRD_PRIV PyTypeObject srd_logic_type;
-
-/* When initialized, a reference to this module inside the python interpreter
+/*
+ * When initialized, a reference to this module inside the Python interpreter
* lives here.
*/
-PyObject *mod_sigrokdecode = NULL;
+SRD_PRIV PyObject *mod_sigrokdecode = NULL;
+
+/** @endcond */
static struct PyModuleDef sigrokdecode_module = {
PyModuleDef_HEAD_INIT,
.m_size = -1,
};
-
+/** @cond PRIVATE */
PyMODINIT_FUNC PyInit_sigrokdecode(void)
{
PyObject *mod;
- /* tp_new needs to be assigned here for compiler portability */
+ /* tp_new needs to be assigned here for compiler portability. */
srd_Decoder_type.tp_new = PyType_GenericNew;
if (PyType_Ready(&srd_Decoder_type) < 0)
return NULL;
mod = PyModule_Create(&sigrokdecode_module);
Py_INCREF(&srd_Decoder_type);
- if (PyModule_AddObject(mod, "Decoder", (PyObject *)&srd_Decoder_type) == -1)
+ if (PyModule_AddObject(mod, "Decoder",
+ (PyObject *)&srd_Decoder_type) == -1)
return NULL;
Py_INCREF(&srd_logic_type);
- if (PyModule_AddObject(mod, "srd_logic", (PyObject *)&srd_logic_type) == -1)
+ if (PyModule_AddObject(mod, "srd_logic",
+ (PyObject *)&srd_logic_type) == -1)
return NULL;
- /* expose output types as symbols in the sigrokdecode module */
- if(PyModule_AddObject(mod, "OUTPUT_ANN",
- PyLong_FromLong(SRD_OUTPUT_ANN)) == -1)
+ /* Expose output types as symbols in the sigrokdecode module */
+ if (PyModule_AddIntConstant(mod, "OUTPUT_ANN", SRD_OUTPUT_ANN) == -1)
return NULL;
- if(PyModule_AddObject(mod, "OUTPUT_PROTO",
- PyLong_FromLong(SRD_OUTPUT_PROTO)) == -1)
+ if (PyModule_AddIntConstant(mod, "OUTPUT_PYTHON", SRD_OUTPUT_PYTHON) == -1)
return NULL;
- if(PyModule_AddObject(mod, "OUTPUT_BINARY",
- PyLong_FromLong(SRD_OUTPUT_BINARY)) == -1)
+ if (PyModule_AddIntConstant(mod, "OUTPUT_BINARY", SRD_OUTPUT_BINARY) == -1)
+ return NULL;
+ if (PyModule_AddIntConstant(mod, "OUTPUT_META", SRD_OUTPUT_META) == -1)
+ return NULL;
+ /* Expose meta input symbols. */
+ if (PyModule_AddIntConstant(mod, "SRD_CONF_SAMPLERATE", SRD_CONF_SAMPLERATE) == -1)
return NULL;
mod_sigrokdecode = mod;
return mod;
}
-
+/** @endcond */