X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decode.c;h=6a86b348dbbff48c838bdab4840bc44d0bb28596;hp=0dd1fda71ec45006ac1a6e95d8d62e99ee325dac;hb=9611dc5f8b88f0dc43fbb00a91d1222ee720d2b6;hpb=4be5b85eed190fd0a57b0c23ae706ec37ed1dfe5

diff --git a/decode.c b/decode.c
index 0dd1fda..6a86b34 100644
--- a/decode.c
+++ b/decode.c
@@ -33,6 +33,8 @@
 
 /* The list of protocol decoders. */
 static GSList *list_pds = NULL;
+/* The list of protocol decoder instances: struct srd_decoder_instance */
+static GSList *decoders;
 
 /*
  * Here's a quick overview of Python/C API reference counting.
@@ -49,8 +51,6 @@ static GSList *list_pds = NULL;
 
 static int srd_load_decoder(const char *name, struct srd_decoder **dec);
 
-static int _unitsize = 1;
-
 static PyObject *emb_put(PyObject *self, PyObject *args)
 {
 	PyObject *arg;
@@ -310,11 +310,12 @@ static int srd_load_decoder(const char *name, struct srd_decoder **dec)
 	return SRD_OK;
 }
 
+/** Create a new decoder instance and add to session. */
 struct srd_decoder_instance *srd_instance_new(const char *id)
 {
 	struct srd_decoder *dec;
 	struct srd_decoder_instance *di;
-	PyObject *py_args, *py_value;
+	PyObject *py_args;
 
 	if (!(dec = srd_get_decoder_by_id(id)))
 		return NULL;
@@ -330,27 +331,19 @@ struct srd_decoder_instance *srd_instance_new(const char *id)
 		return NULL; /* TODO: More specific error? */
 	}
 
-	/*
-	 * FIXME: Pass in a unitsize that matches the selected LA.
-	 * FIXME: Fill 'starttime' with something reasonable.
-	 */
-	py_value = Py_BuildValue("{sssisd}",
-				 "driver", "demo",
-				 "unitsize", _unitsize,
-				 "starttime", 129318231823.0);
-
 	/* Create an instance of the 'Decoder' class. */
-	di->py_instance = PyObject_Call(dec->py_decobj, py_args, py_value);
+	di->py_instance = PyObject_Call(dec->py_decobj, py_args, NULL);
 	if (!di->py_instance) {
 		if (PyErr_Occurred())
 			PyErr_Print(); /* Returns void. */
 		Py_XDECREF(py_args);
-		Py_XDECREF(py_value); /* TODO: Ref. stolen upon error? */
 		return NULL; /* TODO: More specific error? */
 	}
 
+	/* Append to list of PD instances */
+	decoders = g_slist_append(decoders, di);
+
 	Py_XDECREF(py_args);
-	Py_XDECREF(py_value);
 
 	return di;
 }
@@ -377,6 +370,32 @@ int srd_instance_set_probe(struct srd_decoder_instance *di,
 	return SRD_OK;
 }
 
+/** Start decoding session.  Feed metadata to decoder instances. */
+int srd_session_start(const char *driver, int unitsize, uint64_t starttime,
+			uint64_t samplerate)
+{
+	PyObject *py_res;
+	GSList *d;
+	for (d = decoders; d; d = d->next) {
+		struct srd_decoder_instance *di = d->data;
+		/* TODO: Error handling. */
+		if (!(py_res = PyObject_CallMethod(di->py_instance, "start",
+					"{s:s,s:l,s:l,s:l}", 
+					"driver", driver,
+					"unitsize", (long)unitsize,
+					"starttime", (long)starttime,
+					"samplerate", (long)samplerate))) {
+			if (PyErr_Occurred())
+				PyErr_Print(); /* Returns void. */
+
+			return SRD_ERR_PYTHON; /* TODO: More specific error? */
+		}
+		Py_XDECREF(py_res);
+	}
+
+	return SRD_OK;
+}
+
 /**
  * Run the specified decoder function.
  *
@@ -388,12 +407,10 @@ int srd_instance_set_probe(struct srd_decoder_instance *di,
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  */
-int srd_run_decoder(struct srd_decoder_instance *dec,
-		    uint8_t *inbuf, uint64_t inbuflen,
-		    uint8_t **outbuf, uint64_t *outbuflen)
+static int srd_run_decoder(struct srd_decoder_instance *dec,
+		    uint8_t *inbuf, uint64_t inbuflen)
 {
-	PyObject *py_instance, *py_value, *py_res;
-	int ret;
+	PyObject *py_instance, *py_res;
 	/* FIXME: Don't have a timebase available here. Make one up. */
 	static int _timehack = 0;
 
@@ -408,39 +425,40 @@ int srd_run_decoder(struct srd_decoder_instance *dec,
 		return SRD_ERR_ARGS; /* TODO: More specific error? */
 	if (inbuflen == 0) /* No point in working on empty buffers. */
 		return SRD_ERR_ARGS; /* TODO: More specific error? */
-	if (outbuf == NULL)
-		return SRD_ERR_ARGS; /* TODO: More specific error? */
-	if (outbuflen == NULL)
-		return SRD_ERR_ARGS; /* TODO: More specific error? */
 
 	/* TODO: Error handling. */
 	py_instance = dec->py_instance;
 	Py_XINCREF(py_instance);
 
-	/* Get the input buffer as Python "string" (byte array). */
-	/* TODO: int vs. uint64_t for 'inbuflen'? */
-
-	py_value = Py_BuildValue("{sisiss#}",
-				 "time", _timehack,
-				 "duration", 10,
-				 "data", inbuf, inbuflen / _unitsize);
-	
 	if (!(py_res = PyObject_CallMethod(py_instance, "decode",
-					   "O", py_value))) { /* NEWREF */
-		ret = SRD_ERR_PYTHON; /* TODO: More specific error? */
-		goto err_run_decref_args;
-	}
+					   "{s:i,s:i,s:s#}", 
+					   "time", _timehack,
+					   "duration", 10,
+					   "data", inbuf, inbuflen))) { /* NEWREF */
+		if (PyErr_Occurred())
+			PyErr_Print(); /* Returns void. */
 
-	ret = SRD_OK;
+		return SRD_ERR_PYTHON; /* TODO: More specific error? */
+	} 
 
 	Py_XDECREF(py_res);
-err_run_decref_args:
-	Py_XDECREF(py_value);
+	return SRD_OK;
+}
 
-	if (PyErr_Occurred())
-		PyErr_Print(); /* Returns void. */
+/* Feed logic samples to decoder session. */
+int srd_session_feed(uint8_t *inbuf, uint64_t inbuflen)
+{
+	GSList *d;
+	for (d = decoders; d; d = d->next) {
+		/* TODO: Error handling. */
+		
+		int ret = srd_run_decoder(d->data, inbuf, inbuflen);
 
-	return ret;
+		if (ret != SRD_OK) {
+			fprintf(stderr, "Decoder runtime error (%d)\n", ret);
+			exit(1);
+		}
+	}
 }
 
 /**