X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=type_decoder.c;h=8395edd4d21671be3127ad2c5232c4a440b543f6;hp=1434cf233a9f89fdf8ff2b34c9f0e5527833f6c1;hb=fa12a21e3c779df4e33dcfe394e2ded3f96028ce;hpb=58572aed02d81e2cc75749c2c4b516538b5ca9b9

diff --git a/type_decoder.c b/type_decoder.c
index 1434cf2..8395edd 100644
--- a/type_decoder.c
+++ b/type_decoder.c
@@ -20,6 +20,7 @@
 #include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "sigrokdecode-internal.h"
 #include "config.h"
+#include <inttypes.h>
 
 
 /* This is only used for nicer srd_dbg() output. */
@@ -95,9 +96,9 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	int output_id;
 	void (*cb)();
 
-	if (!(di = get_di_by_decobject(self))) {
+	if (!(di = srd_instance_find_by_obj(NULL, self))) {
 		/* Shouldn't happen. */
-		srd_dbg("srd: put(): self instance not found.");
+		srd_dbg("put(): self instance not found.");
 		return NULL;
 	}
 
@@ -114,8 +115,9 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	}
 	pdo = l->data;
 
-	srd_spew("srd: instance %s put %d-%d %s %d", di->instance_id,
-			start_sample, end_sample, OUTPUT_TYPES[output_id], output_id);
+	srd_spew("Instance %s put %" PRIu64 "-%" PRIu64 " %s on oid %d.",
+		 di->instance_id, start_sample, end_sample,
+		 OUTPUT_TYPES[pdo->output_type], output_id);
 
 	if (!(pdata = g_try_malloc0(sizeof(struct srd_proto_data))))
 		return NULL;
@@ -141,6 +143,8 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 			next_di = l->data;
 			/* TODO: is this needed? */
 			Py_XINCREF(next_di->py_instance);
+			srd_spew("Sending %d-%d to instance %s",
+				 start_sample, end_sample, next_di->instance_id);
 			if (!(py_res = PyObject_CallMethod(next_di->py_instance, "decode",
 					"KKO", start_sample, end_sample, data))) {
 				catch_exception("calling %s decode(): ", next_di->instance_id);
@@ -170,7 +174,7 @@ static PyObject *Decoder_add(PyObject *self, PyObject *args)
 	char *proto_id;
 	int output_type, pdo_id;
 
-	if (!(di = get_di_by_decobject(self))) {
+	if (!(di = srd_instance_find_by_obj(NULL, self))) {
 		PyErr_SetString(PyExc_Exception, "decoder instance not found");
 		return NULL;
 	}