X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoder.c;h=becd78516199ec88fe2581ff4a4eb99b2c2f027f;hp=71f479902eb29545b94eb6b98e50bf6df52adfdb;hb=92d992d2e50a1996fa2f436f5217b5a9fb3b7e62;hpb=820bf44828745e7d0a7bb0974164acd899c3c113

diff --git a/decoder.c b/decoder.c
index 71f4799..becd785 100644
--- a/decoder.c
+++ b/decoder.c
@@ -42,6 +42,10 @@
 /* The list of protocol decoders. */
 SRD_PRIV GSList *pd_list = NULL;
 
+/* srd.c */
+extern GSList *searchpaths;
+
+/* session.c */
 extern GSList *sessions;
 
 /* module_sigrokdecode.c */
@@ -246,13 +250,15 @@ err_out:
  */
 SRD_API int srd_decoder_load(const char *module_name)
 {
-	PyObject *py_basedec, *py_method, *py_attr, *py_annlist, *py_ann, \
-		*py_bin_classes, *py_bin_class;
+	PyObject *py_basedec, *py_method, *py_attr, *py_annlist, *py_ann;
+	PyObject *py_bin_classes, *py_bin_class, *py_ann_rows, *py_ann_row;
+	PyObject *py_ann_classes, *py_long;
 	struct srd_decoder *d;
-	int len, ret, i;
-	char **ann, *bin;
+	int ret, i, j;
+	char **ann, **bin, *ann_row_id, *ann_row_desc;
 	struct srd_probe *p;
-	GSList *l;
+	GSList *l, *ann_classes;
+	struct srd_decoder_annotation_row *ann_row;
 
 	if (!srd_check_init())
 		return SRD_ERR;
@@ -377,46 +383,103 @@ SRD_API int srd_decoder_load(const char *module_name)
 	if (PyObject_HasAttrString(d->py_dec, "annotations")) {
 		py_annlist = PyObject_GetAttrString(d->py_dec, "annotations");
 		if (!PyList_Check(py_annlist)) {
-			srd_err("Protocol decoder module %s annotations "
-				"should be a list.", module_name);
+			srd_err("Protocol decoder %s annotations should "
+					"be a list.", module_name);
 			goto err_out;
 		}
-		len = PyList_Size(py_annlist);
-		for (i = 0; i < len; i++) {
+		for (i = 0; i < PyList_Size(py_annlist); i++) {
 			py_ann = PyList_GetItem(py_annlist, i);
 			if (!PyList_Check(py_ann) || PyList_Size(py_ann) != 2) {
-				srd_err("Protocol decoder module %s "
-					"annotation %d should be a list with "
-					"two elements.", module_name, i + 1);
+				srd_err("Protocol decoder %s annotation %d should "
+						"be a list with two elements.", module_name, i + 1);
 				goto err_out;
 			}
 
-			if (py_strlist_to_char(py_ann, &ann) != SRD_OK) {
+			if (py_strseq_to_char(py_ann, &ann) != SRD_OK) {
 				goto err_out;
 			}
 			d->annotations = g_slist_append(d->annotations, ann);
 		}
 	}
 
+	/* Convert annotation_rows to GSList of 'struct srd_decoder_annotation_row'. */
+	d->annotation_rows = NULL;
+	if (PyObject_HasAttrString(d->py_dec, "annotation_rows")) {
+		py_ann_rows = PyObject_GetAttrString(d->py_dec, "annotation_rows");
+		if (!PyTuple_Check(py_ann_rows)) {
+			srd_err("Protocol decoder %s annotation row list "
+				"must be a tuple.", module_name);
+			goto err_out;
+		}
+		for (i = 0; i < PyTuple_Size(py_ann_rows); i++) {
+			py_ann_row = PyTuple_GetItem(py_ann_rows, i);
+			if (!PyTuple_Check(py_ann_row)) {
+				srd_err("Protocol decoder %s annotation rows "
+					"must be tuples.", module_name);
+				goto err_out;
+			}
+			if (PyTuple_Size(py_ann_row) != 3
+					|| !PyUnicode_Check(PyTuple_GetItem(py_ann_row, 0))
+					|| !PyUnicode_Check(PyTuple_GetItem(py_ann_row, 1))
+					|| !PyTuple_Check(PyTuple_GetItem(py_ann_row, 2))) {
+				srd_err("Protocol decoder %s annotation rows "
+					"must contain tuples containing two "
+					"strings and a tuple.", module_name);
+				goto err_out;
+			}
+
+			if (py_str_as_str(PyTuple_GetItem(py_ann_row, 0), &ann_row_id) != SRD_OK)
+				goto err_out;
+
+			if (py_str_as_str(PyTuple_GetItem(py_ann_row, 1), &ann_row_desc) != SRD_OK)
+				goto err_out;
+
+			py_ann_classes = PyTuple_GetItem(py_ann_row, 2);
+			ann_classes = NULL;
+			for (j = 0; j < PyTuple_Size(py_ann_classes); j++) {
+				py_long = PyTuple_GetItem(py_ann_classes, j);
+				if (!PyLong_Check(py_long)) {
+					srd_err("Protocol decoder %s annotation row class "
+						"list must only contain numbers.", module_name);
+					goto err_out;
+				}
+				ann_classes = g_slist_append(ann_classes,
+					GINT_TO_POINTER(PyLong_AsLong(py_long)));
+			}
+
+			ann_row = g_malloc0(sizeof(struct srd_decoder_annotation_row));
+			ann_row->id = ann_row_id;
+			ann_row->desc = ann_row_desc;
+			ann_row->ann_classes = ann_classes;
+			d->annotation_rows = g_slist_append(d->annotation_rows, ann_row);
+		}
+	}
+
 	/* Convert binary class to GSList of char *. */
 	d->binary = NULL;
 	if (PyObject_HasAttrString(d->py_dec, "binary")) {
 		py_bin_classes = PyObject_GetAttrString(d->py_dec, "binary");
 		if (!PyTuple_Check(py_bin_classes)) {
-			srd_err("Protocol decoder module %s binary classes "
-				"should be a tuple.", module_name);
+			srd_err("Protocol decoder %s binary classes should "
+					"be a tuple.", module_name);
 			goto err_out;
 		}
-		len = PyTuple_Size(py_bin_classes);
-		for (i = 0; i < len; i++) {
+		for (i = 0; i < PyTuple_Size(py_bin_classes); i++) {
 			py_bin_class = PyTuple_GetItem(py_bin_classes, i);
-			if (!PyUnicode_Check(py_bin_class)) {
-				srd_err("Protocol decoder module %s binary "
-						"class should be a string.", module_name);
+			if (!PyTuple_Check(py_bin_class)) {
+				srd_err("Protocol decoder %s binary classes "
+						"should consist of tuples.", module_name);
+				goto err_out;
+			}
+			if (PyTuple_Size(py_bin_class) != 2
+					|| !PyUnicode_Check(PyTuple_GetItem(py_bin_class, 0))
+					|| !PyUnicode_Check(PyTuple_GetItem(py_bin_class, 1))) {
+				srd_err("Protocol decoder %s binary classes should "
+						"contain tuples with two strings.", module_name);
 				goto err_out;
 			}
 
-			if (py_str_as_str(py_bin_class, &bin) != SRD_OK) {
+			if (py_strseq_to_char(py_bin_class, &bin) != SRD_OK) {
 				goto err_out;
 			}
 			d->binary = g_slist_append(d->binary, bin);
@@ -556,6 +619,26 @@ SRD_API int srd_decoder_unload(struct srd_decoder *dec)
 	return SRD_OK;
 }
 
+static void srd_decoder_load_all_path(char *path)
+{
+	GDir *dir;
+	const gchar *direntry;
+
+	if (!(dir = g_dir_open(path, 0, NULL)))
+		/* Not really fatal */
+		return;
+
+	/* This ignores errors returned by srd_decoder_load(). That
+	 * function will have logged the cause, but in any case we
+	 * want to continue anyway. */
+	while ((direntry = g_dir_read_name(dir)) != NULL) {
+		/* The directory name is the module name (e.g. "i2c"). */
+		srd_decoder_load(direntry);
+	}
+	g_dir_close(dir);
+
+}
+
 /**
  * Load all installed protocol decoders.
  *
@@ -565,22 +648,13 @@ SRD_API int srd_decoder_unload(struct srd_decoder *dec)
  */
 SRD_API int srd_decoder_load_all(void)
 {
-	GDir *dir;
-	const gchar *direntry;
+	GSList *l;
 
 	if (!srd_check_init())
 		return SRD_ERR;
 
-	if (!(dir = g_dir_open(DECODERS_DIR, 0, NULL))) {
-		srd_err("Unable to open %s for reading.", DECODERS_DIR);
-		return SRD_ERR_DECODERS_DIR;
-	}
-
-	while ((direntry = g_dir_read_name(dir)) != NULL) {
-		/* The directory name is the module name (e.g. "i2c"). */
-		srd_decoder_load(direntry);
-	}
-	g_dir_close(dir);
+	for (l = searchpaths; l; l = l->next)
+		srd_decoder_load_all_path(l->data);
 
 	return SRD_OK;
 }