X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=module_sigrokdecode.c;h=426cf49c28b76c3cb8a0991929cf58c67bb51c43;hp=69bd17e396dc8d740a431e27090c19821cfc69ba;hb=0db89774dee57db500f270985f73f3bb2dcdbb42;hpb=f9a3947a7a8d884de6c55693b216f89b1d27d979

diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c
index 69bd17e..426cf49 100644
--- a/module_sigrokdecode.c
+++ b/module_sigrokdecode.c
@@ -26,7 +26,7 @@ extern PyTypeObject srd_logic_type;
 
 
 static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj,
-		int *annotation_format, char ***annotation)
+		int *ann_format, char ***ann)
 {
 	PyObject *py_tmp;
 	struct srd_pd_output *pdo;
@@ -56,12 +56,12 @@ static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj,
 	}
 
 	ann_id = PyLong_AsLong(py_tmp);
-	if (!(pdo = g_slist_nth_data(di->decoder->annotation, ann_id))) {
+	if (!(pdo = g_slist_nth_data(di->decoder->annotations, ann_id))) {
 		srd_err("Protocol decoder %s submitted data to non-existent annotation format %d",
 				di->decoder->name, ann_id);
 		return SRD_ERR_PYTHON;
 	}
-	*annotation_format = ann_id;
+	*ann_format = ann_id;
 
 	/* Second element must be a list */
 	py_tmp = PyList_GetItem(obj, 1);
@@ -70,7 +70,7 @@ static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj,
 				di->decoder->name);
 		return SRD_ERR_PYTHON;
 	}
-	if (py_strlist_to_char(py_tmp, annotation) != SRD_OK) {
+	if (py_strlist_to_char(py_tmp, ann) != SRD_OK) {
 		srd_err("Protocol decoder %s submitted annotation list, but second element was malformed",
 				di->decoder->name);
 		return SRD_ERR_PYTHON;
@@ -79,23 +79,13 @@ static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj,
 	return SRD_OK;
 }
 
-/* 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;
+	PyObject *data, *py_res;
+	struct srd_decoder_instance *di, *next_di;
 	struct srd_pd_output *pdo;
-	struct srd_protocol_data *pdata;
+	struct srd_proto_data *pdata;
 	uint64_t start_sample, end_sample;
 	int output_id;
 	void (*cb)();
@@ -113,36 +103,48 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	}
 	pdo = l->data;
 
+	if (!(pdata = g_try_malloc0(sizeof(struct srd_proto_data))))
+		return NULL;
+	pdata->start_sample = start_sample;
+	pdata->end_sample = end_sample;
+	pdata->pdo = pdo;
+
 	switch (pdo->output_type) {
-	case SRD_OUTPUT_ANNOTATION:
-	case SRD_OUTPUT_PROTOCOL:
+	case SRD_OUTPUT_ANN:
+		/* Annotations are only fed to callbacks. */
+		if ((cb = srd_find_callback(pdo->output_type))) {
+			/* Annotations need converting from PyObject. */
+			if (convert_pyobj(di, data, &pdata->ann_format,
+					(char ***)&pdata->data) != SRD_OK) {
+				/* An error was already logged. */
+				break;
+			}
+			cb(pdata);
+		}
+		break;
+	case SRD_OUTPUT_PROTO:
+		for (l = di->next_di; l; l = l->next) {
+			next_di = l->data;
+			/* TODO: is this needed? */
+			Py_XINCREF(next_di->py_instance);
+			if (!(py_res = PyObject_CallMethod(next_di->py_instance, "decode",
+					"KKO", start_sample, end_sample, data))) {
+				if (PyErr_Occurred())
+					PyErr_Print();
+			}
+			Py_XDECREF(py_res);
+		}
+		break;
 	case SRD_OUTPUT_BINARY:
+		srd_err("SRD_OUTPUT_BINARY not yet supported");
 		break;
 	default:
 		srd_err("Protocol decoder %s submitted invalid output type %d",
 				di->decoder->name, pdo->output_type);
-		return NULL;
 		break;
 	}
 
-	if ((cb = srd_find_callback(pdo->output_type))) {
-		/* Something registered an interest in this output type. */
-		if (!(pdata = g_try_malloc0(sizeof(struct srd_protocol_data))))
-			return NULL;
-		pdata->start_sample = start_sample;
-		pdata->end_sample = end_sample;
-		pdata->pdo = pdo;
-		if (pdo->output_type == SRD_OUTPUT_ANNOTATION) {
-			/* annotations need converting from PyObject */
-			if (convert_pyobj(di, data, &pdata->annotation_format,
-					(char ***)&pdata->data) != SRD_OK)
-				return NULL;
-		} else {
-			/* annotation_format is unused, data is an opaque blob. */
-			pdata->data = data;
-		}
-		cb(pdata);
-	}
+	g_free(pdata);
 
 	Py_RETURN_NONE;
 }
@@ -152,18 +154,22 @@ static PyObject *Decoder_add(PyObject *self, PyObject *args)
 {
 	PyObject *ret;
 	struct srd_decoder_instance *di;
-	char *protocol_id;
+	char *proto_id;
 	int output_type, pdo_id;
 
-	if (!(di = get_di_by_decobject(self)))
+	if (!(di = get_di_by_decobject(self))) {
+		srd_err("%s():%d decoder instance not found", __func__, __LINE__);
+		PyErr_SetString(PyExc_Exception, "decoder instance not found");
 		return NULL;
+	}
 
-	printf("output_new di %s\n", di->decoder->name);
-
-	if (!PyArg_ParseTuple(args, "is", &output_type, &protocol_id))
+	if (!PyArg_ParseTuple(args, "is", &output_type, &proto_id)) {
+		if (PyErr_Occurred())
+			PyErr_Print();
 		return NULL;
+	}
 
-	pdo_id = pd_add(di, output_type, protocol_id);
+	pdo_id = pd_add(di, output_type, proto_id);
 	if (pdo_id < 0)
 		Py_RETURN_NONE;
 	else
@@ -192,7 +198,6 @@ static PyTypeObject srd_Decoder_type = {
 	.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
 	.tp_doc = "Sigrok Decoder object",
 	.tp_methods = Decoder_methods,
-	.tp_init = (initproc) Decoder_init,
 };
 
 static struct PyModuleDef sigrokdecode_module = {
@@ -225,13 +230,13 @@ PyMODINIT_FUNC PyInit_sigrokdecode(void)
 		return NULL;
 
 	/* expose output types as symbols in the sigrokdecode module */
-	if(PyModule_AddObject(mod, "SRD_OUTPUT_ANNOTATION",
-			PyLong_FromLong(SRD_OUTPUT_ANNOTATION)) == -1)
+	if(PyModule_AddObject(mod, "OUTPUT_ANN",
+			PyLong_FromLong(SRD_OUTPUT_ANN)) == -1)
 		return NULL;
-	if(PyModule_AddObject(mod, "SRD_OUTPUT_PROTOCOL",
-			PyLong_FromLong(SRD_OUTPUT_PROTOCOL)) == -1)
+	if(PyModule_AddObject(mod, "OUTPUT_PROTO",
+			PyLong_FromLong(SRD_OUTPUT_PROTO)) == -1)
 		return NULL;
-	if(PyModule_AddObject(mod, "SRD_OUTPUT_BINARY",
+	if(PyModule_AddObject(mod, "OUTPUT_BINARY",
 			PyLong_FromLong(SRD_OUTPUT_BINARY)) == -1)
 		return NULL;