X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoder.c;h=e25e4e01599556e1db3e9b42d64969d47eece5d4;hp=7753a33f00de04663f486bba8e533a744a0ec6fe;hb=0db89774dee57db500f270985f73f3bb2dcdbb42;hpb=b2c19614a6c4eaa0170971d1261a1bb25212e277

diff --git a/decoder.c b/decoder.c
index 7753a33..e25e4e0 100644
--- a/decoder.c
+++ b/decoder.c
@@ -19,12 +19,12 @@
  */
 
 #include "config.h"
-#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "sigrokdecode-internal.h"
 #include <dirent.h>
 
 /* The list of protocol decoders. */
-GSList *list_pds = NULL;
-GSList *decoders = NULL;
+GSList *pd_list = NULL;
 
 
 /**
@@ -37,7 +37,7 @@ GSList *decoders = NULL;
 GSList *srd_list_decoders(void)
 {
 
-	return list_pds;
+	return pd_list;
 }
 
 
@@ -63,19 +63,19 @@ struct srd_decoder *srd_get_decoder_by_id(const char *id)
 
 
 /**
- * TODO
+ * Load a protocol decoder module into the embedded python interpreter.
  *
- * @param name TODO
+ * @param name The module name to be loaded.
+ * @param dec Pointer to the struct srd_decoder filled with the loaded module.
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  */
 int srd_load_decoder(const char *name, struct srd_decoder **dec)
 {
+	PyObject *py_mod, *py_res, *py_annlist, *py_ann;
 	struct srd_decoder *d;
-	PyObject *py_mod, *py_res;
-	int r;
-
-	fprintf(stdout, "%s: %s\n", __func__, name);
+	int alen, r, i;
+	char **ann;
 
 	/* "Import" the Python module. */
 	if (!(py_mod = PyImport_ImportModule(name))) { /* NEWREF */
@@ -89,37 +89,32 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
 		if (PyErr_Occurred())
 			PyErr_Print(); /* Returns void. */
 		Py_XDECREF(py_mod);
-		fprintf(stderr, "Decoder class not found in PD module %s\n", name);
+		srd_err("Decoder class not found in PD module %s", name);
 		return SRD_ERR_PYTHON; /* TODO: More specific error? */
 	}
 
 	if (!(d = malloc(sizeof(struct srd_decoder))))
 		return SRD_ERR_MALLOC;
 
-	/* We'll just use the name of the module for the ID. */
-	d->id = strdup(name);
-
-	if ((r = h_str(py_res, py_mod, "name", &(d->name))) < 0)
+	if ((r = h_str(py_res, "id", &(d->id))) < 0)
 		return r;
 
-	if ((r = h_str(py_res, py_mod, "longname",
-		       &(d->longname))) < 0)
+	if ((r = h_str(py_res, "name", &(d->name))) < 0)
 		return r;
 
-	if ((r = h_str(py_res, py_mod, "desc", &(d->desc))) < 0)
+	if ((r = h_str(py_res, "longname", &(d->longname))) < 0)
 		return r;
 
-	if ((r = h_str(py_res, py_mod, "longdesc",
-		       &(d->longdesc))) < 0)
+	if ((r = h_str(py_res, "desc", &(d->desc))) < 0)
 		return r;
 
-	if ((r = h_str(py_res, py_mod, "author", &(d->author))) < 0)
+	if ((r = h_str(py_res, "longdesc", &(d->longdesc))) < 0)
 		return r;
 
-	if ((r = h_str(py_res, py_mod, "email", &(d->email))) < 0)
+	if ((r = h_str(py_res, "author", &(d->author))) < 0)
 		return r;
 
-	if ((r = h_str(py_res, py_mod, "license", &(d->license))) < 0)
+	if ((r = h_str(py_res, "license", &(d->license))) < 0)
 		return r;
 
 	d->py_mod = py_mod;
@@ -131,6 +126,29 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
 	d->inputformats = NULL;
 	d->outputformats = NULL;
 
+	/* Convert class annotation attribute to GSList of **char */
+	d->annotations = NULL;
+	if (PyObject_HasAttrString(py_res, "annotations")) {
+		py_annlist = PyObject_GetAttrString(py_res, "annotations");
+		if (!PyList_Check(py_annlist)) {
+			srd_err("Protocol decoder module %s annotations should be a list", name);
+			return SRD_ERR_PYTHON;
+		}
+		alen = PyList_Size(py_annlist);
+		for (i = 0; i < alen; 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",
+						name, i+1);
+				return SRD_ERR_PYTHON;
+			}
+
+			if (py_strlist_to_char(py_ann, &ann) != SRD_OK)
+				return SRD_ERR_PYTHON;
+			d->annotations = g_slist_append(d->annotations, ann);
+		}
+	}
+
 	*dec = d;
 
 	return SRD_OK;
@@ -144,7 +162,11 @@ int srd_unload_decoder(struct srd_decoder *dec)
 {
 	g_free(dec->id);
 	g_free(dec->name);
+	g_free(dec->longname);
 	g_free(dec->desc);
+	g_free(dec->longdesc);
+	g_free(dec->author);
+	g_free(dec->license);
 	g_free(dec->func);
 
 	/* TODO: Free everything in inputformats and outputformats. */
@@ -194,7 +216,7 @@ int srd_load_all_decoders(void)
 		/* TODO: Warning if loading fails for a decoder. */
 		if ((ret = srd_load_decoder(decodername, &dec)) == SRD_OK) {
 			/* Append it to the list of supported/loaded decoders. */
-			list_pds = g_slist_append(list_pds, dec);
+			pd_list = g_slist_append(pd_list, dec);
 		}
 	}
 	closedir(dir);