X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=type_decoder.c;h=bf4a6b1baaf8a940312819145df1e3eedcc86d97;hp=e5426c166f28aa87a7495aa7676be42175dfda97;hb=0b9224604aa166775a6693efba215a33ce594b70;hpb=abeeed8b6da45e1854bc151a8175836b5ca38e34

diff --git a/type_decoder.c b/type_decoder.c
index e5426c1..bf4a6b1 100644
--- a/type_decoder.c
+++ b/type_decoder.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,24 +17,26 @@
  * 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"
 #include <inttypes.h>
 
 /* This is only used for nicer srd_dbg() output. */
 static const char *OUTPUT_TYPES[] = {
 	"OUTPUT_ANN",
-	"OUTPUT_PROTO",
+	"OUTPUT_PYTHON",
 	"OUTPUT_BINARY",
 };
 
-static int convert_pyobj(struct srd_decoder_inst *di, PyObject *obj,
-			 int *ann_format, char ***ann)
+static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
+		struct srd_proto_data *pdata)
 {
 	PyObject *py_tmp;
 	struct srd_pd_output *pdo;
-	int ann_id;
+	struct srd_proto_data_annotation *pda;
+	int ann_format;
+	char **ann_text;
 
 	/* Should be a list of [annotation format, [string, ...]]. */
 	if (!PyList_Check(obj) && !PyTuple_Check(obj)) {
@@ -61,14 +63,12 @@ static int convert_pyobj(struct srd_decoder_inst *di, PyObject *obj,
 			"first element was not an integer.", di->decoder->name);
 		return SRD_ERR_PYTHON;
 	}
-
-	ann_id = PyLong_AsLong(py_tmp);
-	if (!(pdo = g_slist_nth_data(di->decoder->annotations, ann_id))) {
+	ann_format = PyLong_AsLong(py_tmp);
+	if (!(pdo = g_slist_nth_data(di->decoder->annotations, ann_format))) {
 		srd_err("Protocol decoder %s submitted data to unregistered "
-			"annotation format %d.", di->decoder->name, ann_id);
+			"annotation format %d.", di->decoder->name, ann_format);
 		return SRD_ERR_PYTHON;
 	}
-	*ann_format = ann_id;
 
 	/* Second element must be a list. */
 	py_tmp = PyList_GetItem(obj, 1);
@@ -77,25 +77,31 @@ static int convert_pyobj(struct srd_decoder_inst *di, PyObject *obj,
 			"second element was not a list.", di->decoder->name);
 		return SRD_ERR_PYTHON;
 	}
-	if (py_strlist_to_char(py_tmp, ann) != SRD_OK) {
+	if (py_strlist_to_char(py_tmp, &ann_text) != SRD_OK) {
 		srd_err("Protocol decoder %s submitted annotation list, but "
 			"second element was malformed.", di->decoder->name);
 		return SRD_ERR_PYTHON;
 	}
 
+	if (!(pda = g_try_malloc(sizeof(struct srd_proto_data_annotation))))
+		return SRD_ERR_MALLOC;
+	pda->ann_format = ann_format;
+	pda->ann_text = ann_text;
+	pdata->data = pda;
+
 	return SRD_OK;
 }
 
 static PyObject *Decoder_put(PyObject *self, PyObject *args)
 {
 	GSList *l;
-	PyObject *data, *py_res;
+	PyObject *py_data, *py_res;
 	struct srd_decoder_inst *di, *next_di;
 	struct srd_pd_output *pdo;
 	struct srd_proto_data *pdata;
 	uint64_t start_sample, end_sample;
 	int output_id;
-	void (*cb)();
+	struct srd_pd_callback *cb;
 
 	if (!(di = srd_inst_find_by_obj(NULL, self))) {
 		/* Shouldn't happen. */
@@ -104,7 +110,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	}
 
 	if (!PyArg_ParseTuple(args, "KKiO", &start_sample, &end_sample,
-	    &output_id, &data)) {
+	    &output_id, &py_data)) {
 		/*
 		 * This throws an exception, but by returning NULL here we let
 		 * Python raise it. This results in a much better trace in
@@ -135,17 +141,16 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	switch (pdo->output_type) {
 	case SRD_OUTPUT_ANN:
 		/* Annotations are only fed to callbacks. */
-		if ((cb = srd_find_callback(pdo->output_type))) {
+		if ((cb = srd_pd_output_callback_find(di->sess, pdo->output_type))) {
 			/* Annotations need converting from PyObject. */
-			if (convert_pyobj(di, data, &pdata->ann_format,
-					  (char ***)&pdata->data) != SRD_OK) {
+			if (convert_annotation(di, py_data, pdata) != SRD_OK) {
 				/* An error was already logged. */
 				break;
 			}
-			cb(pdata);
+			cb->cb(pdata, cb->cb_data);
 		}
 		break;
-	case SRD_OUTPUT_PROTO:
+	case SRD_OUTPUT_PYTHON:
 		for (l = di->next_di; l; l = l->next) {
 			next_di = l->data;
 			/* TODO: Is this needed? */
@@ -155,9 +160,9 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 				 next_di->inst_id);
 			if (!(py_res = PyObject_CallMethod(
 			    next_di->py_inst, "decode", "KKO", start_sample,
-			    end_sample, data))) {
-				catch_exception("Calling %s decode(): ",
-						next_di->inst_id);
+			    end_sample, py_data))) {
+				srd_exception_catch("Calling %s decode(): ",
+						    next_di->inst_id);
 			}
 			Py_XDECREF(py_res);
 		}
@@ -193,7 +198,7 @@ static PyObject *Decoder_add(PyObject *self, PyObject *args)
 		return NULL;
 	}
 
-	pdo_id = pd_add(di, output_type, proto_id);
+	pdo_id = srd_inst_pd_output_add(di, output_type, proto_id);
 	if (pdo_id < 0)
 		Py_RETURN_NONE;
 	else
@@ -209,6 +214,7 @@ static PyMethodDef Decoder_methods[] = {
 	{NULL, NULL, 0, NULL}
 };
 
+/** @cond PRIVATE */
 SRD_PRIV PyTypeObject srd_Decoder_type = {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	.tp_name = "sigrokdecode.Decoder",
@@ -217,3 +223,4 @@ SRD_PRIV PyTypeObject srd_Decoder_type = {
 	.tp_doc = "sigrok Decoder base class",
 	.tp_methods = Decoder_methods,
 };
+/** @endcond */