X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=type_decoder.c;h=3f4bae9d774742f791f3ec6d27b81041408ac59d;hb=efa641735217e5425f93e69cbaddf70d75c7e9e4;hp=9cf77708dee62982fe6117db67f15afaab1767aa;hpb=aafeeaea1731a1e0c8322527ccb0e4cdcc5ffb01;p=libsigrokdecode.git

diff --git a/type_decoder.c b/type_decoder.c
index 9cf7770..3f4bae9 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,8 +17,8 @@
  * 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>
 
@@ -95,7 +95,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	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. */
@@ -142,7 +142,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 				/* An error was already logged. */
 				break;
 			}
-			cb(pdata);
+			cb->cb(pdata, cb->cb_data);
 		}
 		break;
 	case SRD_OUTPUT_PROTO:
@@ -209,6 +209,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 +218,4 @@ SRD_PRIV PyTypeObject srd_Decoder_type = {
 	.tp_doc = "sigrok Decoder base class",
 	.tp_methods = Decoder_methods,
 };
+/** @endcond */