X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=controller.c;h=3292603b1df909f0fb250f5ddf7e927cd45206fb;hb=f38ec2855ce41154bc1035dd7f1ab9a21f411f0d;hp=6bb7748ef05eee8b9890a665289f867a08833389;hpb=0bdadba205a6d7688a2bb8d98ab342abe22acd6e;p=libsigrokdecode.git

diff --git a/controller.c b/controller.c
index 6bb7748..3292603 100644
--- a/controller.c
+++ b/controller.c
@@ -114,13 +114,36 @@ int srd_exit(void)
  * Add search directories for the protocol decoders.
  *
  * TODO: add path from env var SIGROKDECODE_PATH, config etc
+ * TODO: Should take directoryname/path as input.
  */
 int set_modulepath(void)
 {
 	int ret;
+	gchar *path, *s;
 
-	PyRun_SimpleString("import sys");
-	ret = PyRun_SimpleString("sys.path.append(r'" DECODERS_DIR "');");
+#ifdef _WIN32
+	gchar **splitted;
+
+	/*
+	 * On Windows/MinGW, Python's sys.path needs entries of the form
+	 * 'C:\\foo\\bar' instead of '/foo/bar'.
+	 */
+
+	splitted = g_strsplit(DECODERS_DIR, "/", 0);
+	path = g_build_pathv("\\\\", splitted);
+	g_strfreev(splitted);
+#else
+	path = g_strdup(DECODERS_DIR);
+#endif
+
+	/* TODO: Prepend instead of appending. */
+	/* TODO: Sanity check on 'path' (length, escape special chars, ...). */
+	s = g_strdup_printf("import sys; sys.path.append(r'%s')", path);
+
+	ret = PyRun_SimpleString(s);
+
+	g_free(path);
+	g_free(s);
 
 	return ret;
 }
@@ -146,24 +169,23 @@ int srd_instance_set_options(struct srd_decoder_instance *di,
 	int num_optkeys, ret, size, i;
 	char *key, *value;
 
-	if (g_hash_table_size(options) == 0)
-		/* No options provided. */
-		return SRD_OK;
-
-	if(!PyObject_HasAttrString(di->decoder->py_dec, "options"))
+	if(!PyObject_HasAttrString(di->decoder->py_dec, "options")) {
 		/* Decoder has no options. */
+		if (g_hash_table_size(options) == 0) {
+			/* No options provided. */
+			return SRD_OK;
+		} else {
+			srd_err("Protocol decoder has no options.");
+			return SRD_ERR_ARG;
+		}
 		return SRD_OK;
+	}
 
 	ret = SRD_ERR_PYTHON;
 	key = NULL;
 	py_dec_options = py_dec_optkeys = py_di_options = py_optval = NULL;
 	py_optlist = py_classval = NULL;
 	py_dec_options = PyObject_GetAttrString(di->decoder->py_dec, "options");
-	if (!PyDict_Check(py_dec_options)) {
-		srd_err("Protocol decoder %s options is not a dictionary.",
-				di->decoder->name);
-		goto err_out;
-	}
 
 	/* All of these are synthesized objects, so they're good. */
 	py_dec_optkeys = PyDict_Keys(py_dec_options);
@@ -177,6 +199,10 @@ int srd_instance_set_options(struct srd_decoder_instance *di,
 			goto err_out;
 		if (!(py_classval = PyList_GetItem(py_optlist, 1)))
 			goto err_out;
+		if (!PyUnicode_Check(py_classval) && !PyLong_Check(py_classval)) {
+			srd_err("Options of type %s are not yet supported.", Py_TYPE(py_classval)->tp_name);
+			goto err_out;
+		}
 
 		if ((value = g_hash_table_lookup(options, key))) {
 			/* An override for this option was provided. */
@@ -242,6 +268,12 @@ err_out:
 	return ret;
 }
 
+static gint compare_probe_id(struct srd_probe *a, char *probe_id)
+{
+
+	return strcmp(a->id, probe_id);
+}
+
 /**
  * Set probes in a decoder instance.
  *
@@ -250,34 +282,57 @@ err_out:
  * the probe number. Samples passed to this instance will be arranged in this
  * order.
  *
- * Handled probes are removed from the hash.
- *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  */
 int srd_instance_set_probes(struct srd_decoder_instance *di,
-		GHashTable *probes)
+		GHashTable *new_probes)
 {
-	int ret;
+	GList *l;
+	GSList *sl;
+	struct srd_probe *p;
+	int *new_probemap, new_probenum;
+	char *probe_id;
 
-	if (g_hash_table_size(probes) == 0)
+	if (g_hash_table_size(new_probes) == 0)
 		/* No probes provided. */
 		return SRD_OK;
 
-	if(!PyObject_HasAttrString(di->decoder->py_dec, "probes"))
+	if(!PyObject_HasAttrString(di->decoder->py_dec, "probes")
+		&& !PyObject_HasAttrString(di->decoder->py_dec, "extra_probes")) {
 		/* Decoder has no probes. */
-		return SRD_OK;
+		srd_err("Protocol decoder %s has no probes to define.",
+				di->decoder->name);
+		return SRD_ERR_ARG;
+	}
 
-	ret = SRD_ERR_PYTHON;
+	new_probemap = NULL;
 
-	/* TODO */
-	if (g_hash_table_size(probes) > 0) {
-		srd_err("Setting probes is not yet supported.");
-		return SRD_ERR_PYTHON;
+	if (!(new_probemap = g_try_malloc(sizeof(int) * di->dec_num_probes))) {
+		srd_err("Failed to malloc new probe map.");
+		return SRD_ERR_MALLOC;
 	}
 
-	ret = SRD_OK;
+	for (l = g_hash_table_get_keys(new_probes); l; l = l->next) {
+		probe_id = l->data;
+		new_probenum = strtol(g_hash_table_lookup(new_probes, probe_id), NULL, 10);
+		if (!(sl = g_slist_find_custom(di->decoder->probes, probe_id,
+				(GCompareFunc)compare_probe_id))) {
+			/* Fall back on optional probes. */
+			if (!(sl = g_slist_find_custom(di->decoder->extra_probes,
+					probe_id, (GCompareFunc)compare_probe_id))) {
+				srd_err("Protocol decoder %s has no probe '%s'",
+						di->decoder->name, probe_id);
+				g_free(new_probemap);
+				return SRD_ERR_ARG;
+			}
+		}
+		p = sl->data;
+		new_probemap[p->order] = new_probenum;
+	}
+	g_free(di->dec_probemap);
+	di->dec_probemap = new_probemap;
 
-	return ret;
+	return SRD_OK;
 }
 
 /**
@@ -294,6 +349,7 @@ struct srd_decoder_instance *srd_instance_new(const char *decoder_id,
 {
 	struct srd_decoder *dec;
 	struct srd_decoder_instance *di;
+	int i;
 	char *instance_id;
 
 	srd_dbg("%s: creating new %s instance", __func__, decoder_id);
@@ -313,23 +369,37 @@ struct srd_decoder_instance *srd_instance_new(const char *decoder_id,
 	di->instance_id = g_strdup(instance_id ? instance_id : decoder_id);
 	g_hash_table_remove(options, "id");
 
+	/* Prepare a default probe map, where samples come in the
+	 * order in which the decoder class defined them.
+	 */
+	di->dec_num_probes = g_slist_length(di->decoder->probes) +
+			g_slist_length(di->decoder->extra_probes);
+	if (!(di->dec_probemap = g_try_malloc(sizeof(int) * di->dec_num_probes))) {
+		srd_err("Failed to malloc probe map.");
+		g_free(di);
+		return NULL;
+	}
+	for (i = 0; i < di->dec_num_probes; i++)
+		di->dec_probemap[i] = i;
+
 	/* Create a new instance of this decoder class. */
 	if (!(di->py_instance = PyObject_CallObject(dec->py_dec, NULL))) {
 		if (PyErr_Occurred())
 			PyErr_Print();
+		g_free(di->dec_probemap);
 		g_free(di);
 		return NULL;
 	}
 
-	/* Instance takes input from a frontend by default. */
-	di_list = g_slist_append(di_list, di);
-
 	if (srd_instance_set_options(di, options) != SRD_OK) {
-		di_list = g_slist_remove(di_list, di);
+		g_free(di->dec_probemap);
 		g_free(di);
 		return NULL;
 	}
 
+	/* Instance takes input from a frontend by default. */
+	di_list = g_slist_append(di_list, di);
+
 	return di;
 }
 
@@ -395,8 +465,8 @@ int srd_instance_start(struct srd_decoder_instance *di, PyObject *args)
 		return SRD_ERR_PYTHON;
 	}
 
-	Py_XDECREF(py_res);
-	Py_DECREF(py_name);
+	Py_DecRef(py_res);
+	Py_DecRef(py_name);
 
 	return SRD_OK;
 }
@@ -439,7 +509,7 @@ int srd_instance_decode(uint64_t start_samplenum,
 	logic->sample = PyList_New(2);
 	Py_INCREF(logic->sample);
 
-	end_samplenum = start_samplenum + inbuflen / di->unitsize;
+	end_samplenum = start_samplenum + inbuflen / di->data_unitsize;
 	if (!(py_res = PyObject_CallMethod(py_instance, "decode",
 			"KKO", logic->start_samplenum, end_samplenum, logic))) {
 		if (PyErr_Occurred())
@@ -469,9 +539,9 @@ int srd_session_start(int num_probes, int unitsize, uint64_t samplerate)
 	/* Run the start() method on all decoders receiving frontend data. */
 	for (d = di_list; d; d = d->next) {
 		di = d->data;
-		di->num_probes = num_probes;
-		di->unitsize = unitsize;
-		di->samplerate = samplerate;
+		di->data_num_probes = num_probes;
+		di->data_unitsize = unitsize;
+		di->data_samplerate = samplerate;
 		if ((ret = srd_instance_start(di, args) != SRD_OK))
 			return ret;