X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=type_decoder.c;h=ef0e9d8465dc4bc0f01e1e243ce84b50dde32514;hp=38fa1ae836d3bc5696327f4695f7507987b936f8;hb=22630a3d54361f083877a68724e8b823d5e063a7;hpb=d75d8a7c40011cdc15be8330b5efbdf812c4fe27

diff --git a/type_decoder.c b/type_decoder.c
index 38fa1ae..ef0e9d8 100644
--- a/type_decoder.c
+++ b/type_decoder.c
@@ -17,11 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "libsigrokdecode-internal.h"
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
 #include "config.h"
 #include <inttypes.h>
 
+typedef struct {
+        PyObject_HEAD
+} srd_Decoder;
+
 /* This is only used for nicer srd_dbg() output. */
 static const char *OUTPUT_TYPES[] = {
 	"OUTPUT_ANN",
@@ -36,10 +40,10 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
 	PyObject *py_tmp;
 	struct srd_pd_output *pdo;
 	struct srd_proto_data_annotation *pda;
-	int ann_format;
+	int ann_class;
 	char **ann_text;
 
-	/* Should be a list of [annotation format, [string, ...]]. */
+	/* Should be a list of [annotation class, [string, ...]]. */
 	if (!PyList_Check(obj) && !PyTuple_Check(obj)) {
 		srd_err("Protocol decoder %s submitted %s instead of list.",
 			di->decoder->name, obj->ob_type->tp_name);
@@ -56,7 +60,7 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
 
 	/*
 	 * The first element should be an integer matching a previously
-	 * registered annotation format.
+	 * registered annotation class.
 	 */
 	py_tmp = PyList_GetItem(obj, 0);
 	if (!PyLong_Check(py_tmp)) {
@@ -64,10 +68,10 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
 			"first element was not an integer.", di->decoder->name);
 		return SRD_ERR_PYTHON;
 	}
-	ann_format = PyLong_AsLong(py_tmp);
-	if (!(pdo = g_slist_nth_data(di->decoder->annotations, ann_format))) {
+	ann_class = PyLong_AsLong(py_tmp);
+	if (!(pdo = g_slist_nth_data(di->decoder->annotations, ann_class))) {
 		srd_err("Protocol decoder %s submitted data to unregistered "
-			"annotation format %d.", di->decoder->name, ann_format);
+			"annotation class %d.", di->decoder->name, ann_class);
 		return SRD_ERR_PYTHON;
 	}
 
@@ -78,7 +82,7 @@ static int convert_annotation(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_text) != SRD_OK) {
+	if (py_strseq_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;
@@ -86,7 +90,7 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
 
 	if (!(pda = g_try_malloc(sizeof(struct srd_proto_data_annotation))))
 		return SRD_ERR_MALLOC;
-	pda->ann_format = ann_format;
+	pda->ann_class = ann_class;
 	pda->ann_text = ann_text;
 	pdata->data = pda;
 
@@ -209,7 +213,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	}
 
 	if (!PyArg_ParseTuple(args, "KKiO", &start_sample, &end_sample,
-	    &output_id, &py_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
@@ -252,19 +256,22 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	case SRD_OUTPUT_PYTHON:
 		for (l = di->next_di; l; l = l->next) {
 			next_di = l->data;
-			/* TODO: Is this needed? */
-			Py_XINCREF(next_di->py_inst);
 			srd_spew("Sending %d-%d to instance %s",
-				 start_sample, end_sample,
-				 next_di->inst_id);
+				 start_sample, end_sample, next_di->inst_id);
 			if (!(py_res = PyObject_CallMethod(
-			    next_di->py_inst, "decode", "KKO", start_sample,
-			    end_sample, py_data))) {
+				next_di->py_inst, "decode", "KKO", start_sample,
+				end_sample, py_data))) {
 				srd_exception_catch("Calling %s decode(): ",
-						    next_di->inst_id);
+							next_di->inst_id);
 			}
 			Py_XDECREF(py_res);
 		}
+		if ((cb = srd_pd_output_callback_find(di->sess, pdo->output_type))) {
+			/* Frontends aren't really supposed to get Python
+			 * callbacks, but it's useful for testing. */
+			pdata->data = py_data;
+			cb->cb(pdata, cb->cb_data);
+		}
 		break;
 	case SRD_OUTPUT_BINARY:
 		if ((cb = srd_pd_output_callback_find(di->sess, pdo->output_type))) {
@@ -366,23 +373,9 @@ static PyObject *Decoder_register(PyObject *self, PyObject *args,
 	return py_new_output_id;
 }
 
-/* TODO: this is just a stub that calls _register() until all PDs
- * are changed to use the new register API. */
-static PyObject *Decoder_add(PyObject *self, PyObject *args)
-{
-	PyObject *py_keywords, *py_new_output_id;
-
-	py_keywords = PyDict_New();
-	py_new_output_id = Decoder_register(self, args, py_keywords);
-	Py_DecRef(py_keywords);
-
-	return py_new_output_id;
-}
-
 static PyMethodDef Decoder_methods[] = {
 	{"put", Decoder_put, METH_VARARGS,
 	 "Accepts a dictionary with the following keys: startsample, endsample, data"},
-	{"add", Decoder_add, METH_VARARGS, "Create a new output stream"},
 	{"register", (PyCFunction)Decoder_register, METH_VARARGS|METH_KEYWORDS,
 			"Register a new output stream"},
 	{NULL, NULL, 0, NULL}