X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=module_sigrokdecode.c;h=a76645c582c6e205912d03d6f4299eb069551303;hp=b547e9d697019d0f7459ba8423d4b244f37f10ff;hb=b08272363131621c7571a02ac752e727e0ed54df;hpb=bc5f5a434e148db1843be7b02b95a35d21237702

diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c
index b547e9d..a76645c 100644
--- a/module_sigrokdecode.c
+++ b/module_sigrokdecode.c
@@ -18,118 +18,34 @@
  */
 
 #include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "sigrokdecode-internal.h"
 #include "config.h"
 
-/* lives in type_logic.c */
-extern PyTypeObject srd_logic_type;
+/* type_decoder.c */
+extern SRD_PRIV PyTypeObject srd_Decoder_type;
 
+/* type_logic.c */
+extern SRD_PRIV PyTypeObject srd_logic_type;
 
-/* TODO: not used, doesn't work actually */
-static PyObject *Decoder_init(PyObject *self, PyObject *args)
-{
-	(void)self;
-	(void)args;
-	printf("init Decoder object %p\n", self);
-
-	Py_RETURN_NONE;
-}
-
-static PyObject *Decoder_put(PyObject *self, PyObject *args)
-{
-	GSList *l;
-	PyObject *data;
-	struct srd_decoder_instance *di;
-	struct srd_pd_output *pdo;
-	uint64_t timeoffset, duration;
-	int output_id;
-
-	if (!(di = get_di_by_decobject(self)))
-		return NULL;
-
-	if (!PyArg_ParseTuple(args, "KKiO", &timeoffset, &duration, &output_id, &data))
-		return NULL;
-
-	if (!(l = g_slist_nth(di->pd_output, output_id))) {
-		/* PD supplied invalid output id */
-		/* TODO: better error message */
-		return NULL;
-	}
-	pdo = l->data;
-
-	/* TODO: SRD_OUTPUT_ANNOTATION should go back up to the caller,
-	 * and SRD_OUTPUT_PROTOCOL should go up the PD stack.
-	 */
-	printf("stream %d: ", pdo->output_type);
-	PyObject_Print(data, stdout, Py_PRINT_RAW);
-	puts("");
-
-	Py_RETURN_NONE;
-}
-
-
-static PyObject *Decoder_output_new(PyObject *self, PyObject *py_output_type)
-{
-	PyObject *ret;
-	struct srd_decoder_instance *di;
-	char *protocol_id, *description;
-	int output_type, pdo_id;
-
-	if (!(di = get_di_by_decobject(self)))
-		return NULL;
-
-	printf("output_new di %s\n", di->decoder->name);
-
-	if (!PyArg_ParseTuple(py_output_type, "i:output_type", &output_type))
-		return NULL;
-
-	protocol_id = "i2c";
-	description = "blah";
-	pdo_id = pd_output_new(di, output_type, protocol_id, description);
-	if (pdo_id < 0)
-		Py_RETURN_NONE;
-	else
-		ret = Py_BuildValue("i", pdo_id);
-
-	return ret;
-}
-
-static PyMethodDef no_methods[] = { {NULL, NULL, 0, NULL} };
-static PyMethodDef Decoder_methods[] = {
-	{"put", Decoder_put, METH_VARARGS,
-	 "Accepts a dictionary with the following keys: time, duration, data"},
-	{"output_new", Decoder_output_new, METH_VARARGS,
-	 "Create a new output stream"},
-	{NULL, NULL, 0, NULL}
-};
-
-
-typedef struct {
-	PyObject_HEAD
-} sigrok_Decoder_object;
-
-static PyTypeObject srd_Decoder_type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	.tp_name = "sigrokdecode.Decoder",
-	.tp_basicsize = sizeof(sigrok_Decoder_object),
-	.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-	.tp_doc = "Sigrok Decoder object",
-	.tp_methods = Decoder_methods,
-	.tp_init = (initproc) Decoder_init,
-};
+/*
+ * When initialized, a reference to this module inside the Python interpreter
+ * lives here.
+ */
+SRD_PRIV PyObject *mod_sigrokdecode = NULL;
 
 static struct PyModuleDef sigrokdecode_module = {
 	PyModuleDef_HEAD_INIT,
 	.m_name = "sigrokdecode",
-	.m_doc = "sigrokdecode base class",
+	.m_doc = "sigrokdecode module",
 	.m_size = -1,
-	.m_methods = no_methods,
 };
 
+/* FIXME: SRD_PRIV causes issues on MinGW. Investigate. */
 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;
@@ -140,12 +56,25 @@ PyMODINIT_FUNC PyInit_sigrokdecode(void)
 
 	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_AddIntConstant(mod, "OUTPUT_ANN", SRD_OUTPUT_ANN) == -1)
+		return NULL;
+	if (PyModule_AddIntConstant(mod, "OUTPUT_PROTO",
+	    SRD_OUTPUT_PROTO) == -1)
+		return NULL;
+	if (PyModule_AddIntConstant(mod, "OUTPUT_BINARY",
+	    SRD_OUTPUT_BINARY) == -1)
+		return NULL;
+
+	mod_sigrokdecode = mod;
+
 	return mod;
 }
-