X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=controller.c;h=963345c637c1b09ce550ecf623f1778ed48faf3c;hp=20364f7076c8d4eab8c7fdacd8d4c5db8b293d4f;hb=9e681b1b7f7c1d6d4d56ad476647e21fd6f835c6;hpb=42a85ed0aed14216232ae48af1b5b709ec31f800

diff --git a/controller.c b/controller.c
index 20364f7..963345c 100644
--- a/controller.c
+++ b/controller.c
@@ -168,7 +168,7 @@ struct srd_decoder_instance *srd_instance_new(const char *id,
 	}
 
 	/* Create an instance of the 'Decoder' class. */
-	di->py_instance = PyObject_Call(dec->py_decobj, py_args, NULL);
+	di->py_instance = PyObject_Call(dec->py_dec, py_args, NULL);
 	if (!di->py_instance) {
 		if (PyErr_Occurred())
 			PyErr_Print();
@@ -230,6 +230,7 @@ int srd_instance_set_probe(struct srd_decoder_instance *di,
 	return SRD_OK;
 }
 
+/* TODO: this should go into the PD stack */
 struct srd_decoder_instance *srd_instance_find(char *instance_id)
 {
 	GSList *l;
@@ -376,7 +377,7 @@ int srd_session_feed(uint64_t timeoffset, uint64_t duration, uint8_t *inbuf,
 
 
 int pd_add(struct srd_decoder_instance *di, int output_type,
-		char *protocol_id)
+		char *proto_id)
 {
 	struct srd_pd_output *pdo;
 
@@ -387,7 +388,7 @@ int pd_add(struct srd_decoder_instance *di, int output_type,
 	pdo->pdo_id = g_slist_length(di->pd_output);
 	pdo->output_type = output_type;
 	pdo->decoder = di->decoder;
-	pdo->protocol_id = g_strdup(protocol_id);
+	pdo->proto_id = g_strdup(proto_id);
 	di->pd_output = g_slist_append(di->pd_output, pdo);
 
 	return pdo->pdo_id;