From: Bert Vermeulen <redacted>
Date: Sat, 7 Jan 2012 02:59:16 +0000 (+0100)
Subject: Decoder.output_new() now takes an extra protocol_id argument.
X-Git-Tag: libsigrokdecode-0.1.0~199
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=0ee4dd54ce134158cd2068866ddc7d32c692d457;p=libsigrokdecode.git

Decoder.output_new() now takes an extra protocol_id argument.
---

diff --git a/decoders/i2c.py b/decoders/i2c.py
index 0f554f7..23b12c3 100644
--- a/decoders/i2c.py
+++ b/decoders/i2c.py
@@ -180,8 +180,8 @@ class Decoder(sigrokdecode.Decoder):
         self.oldsda = None
 
     def start(self, metadata):
-        self.output_protocol = self.output_new(1)
-        self.output_annotation = self.output_new(0)
+        self.output_protocol = self.output_new(1, 'i2c')
+        self.output_annotation = self.output_new(0, 'i2c')
 
     def report(self):
         pass
diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c
index d4af5c3..b3bdafd 100644
--- a/module_sigrokdecode.c
+++ b/module_sigrokdecode.c
@@ -128,7 +128,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	case SRD_OUTPUT_PROTOCOL:
 
 		/* TODO: SRD_OUTPUT_PROTOCOL should go up the PD stack. */
-		printf("%s protocol data: ", pdo->decoder->name);
+		printf("%s protocol data: ", pdo->protocol_id);
 		PyObject_Print(data, stdout, Py_PRINT_RAW);
 		puts("");
 		break;
@@ -143,7 +143,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 }
 
 
-static PyObject *Decoder_output_new(PyObject *self, PyObject *py_output_type)
+static PyObject *Decoder_output_new(PyObject *self, PyObject *args)
 {
 	PyObject *ret;
 	struct srd_decoder_instance *di;
@@ -155,11 +155,9 @@ static PyObject *Decoder_output_new(PyObject *self, PyObject *py_output_type)
 
 	printf("output_new di %s\n", di->decoder->name);
 
-	if (!PyArg_ParseTuple(py_output_type, "i:output_type", &output_type))
+	if (!PyArg_ParseTuple(args, "is", &output_type, &protocol_id))
 		return NULL;
 
-	/* TODO: take protocol_id from python */
-	protocol_id = "i2c";
 	pdo_id = pd_output_new(di, output_type, protocol_id);
 	if (pdo_id < 0)
 		Py_RETURN_NONE;