X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoder.c;h=c379d4bdc5150dab53eef390f4d8e0030a680eb5;hp=c8eb98fb1b641103f0c7548eaf4f942956cd1e45;hb=e195c025c303e361d0cc5a207f9c9443fb8deced;hpb=8c664ca2d7b4faffa7b3dbeb3b9e491976c24eee

diff --git a/decoder.c b/decoder.c
index c8eb98f..c379d4b 100644
--- a/decoder.c
+++ b/decoder.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "sigrokdecode-internal.h"
+#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode-internal.h"
 #include <glib.h>
 
 /**
@@ -42,6 +42,8 @@
 /* The list of protocol decoders. */
 SRD_PRIV GSList *pd_list = NULL;
 
+extern GSList *sessions;
+
 /* module_sigrokdecode.c */
 extern SRD_PRIV PyObject *mod_sigrokdecode;
 
@@ -217,6 +219,8 @@ static int get_options(struct srd_decoder *d)
 		}
 		g_variant_ref_sink(o->def);
 		d->options = g_slist_append(d->options, o);
+		g_free(key);
+		key = NULL;
 	}
 	Py_DecRef(py_keys);
 	Py_DecRef(py_values);
@@ -241,13 +245,20 @@ err_out:
  */
 SRD_API int srd_decoder_load(const char *module_name)
 {
-	PyObject *py_basedec, *py_method, *py_attr, *py_annlist, *py_ann;
+	PyObject *py_basedec, *py_method, *py_attr, *py_annlist, *py_ann, \
+		*py_bin_classes, *py_bin_class;
 	struct srd_decoder *d;
-	int alen, ret, i;
-	char **ann;
+	int len, ret, i;
+	char **ann, *bin;
 	struct srd_probe *p;
 	GSList *l;
 
+	if (!srd_check_init())
+		return SRD_ERR;
+
+	if (!module_name)
+		return SRD_ERR_ARG;
+
 	srd_dbg("Loading protocol decoder '%s'.", module_name);
 
 	py_basedec = py_method = py_attr = NULL;
@@ -355,7 +366,7 @@ SRD_API int srd_decoder_load(const char *module_name)
 	if (py_attr_as_str(d->py_dec, "license", &(d->license)) != SRD_OK)
 		goto err_out;
 
-	/* Convert class annotation attribute to GSList of **char. */
+	/* Convert annotation class attribute to GSList of char **. */
 	d->annotations = NULL;
 	if (PyObject_HasAttrString(d->py_dec, "annotations")) {
 		py_annlist = PyObject_GetAttrString(d->py_dec, "annotations");
@@ -364,8 +375,8 @@ SRD_API int srd_decoder_load(const char *module_name)
 				"should be a list.", module_name);
 			goto err_out;
 		}
-		alen = PyList_Size(py_annlist);
-		for (i = 0; i < alen; i++) {
+		len = PyList_Size(py_annlist);
+		for (i = 0; i < len; i++) {
 			py_ann = PyList_GetItem(py_annlist, i);
 			if (!PyList_Check(py_ann) || PyList_Size(py_ann) != 2) {
 				srd_err("Protocol decoder module %s "
@@ -381,6 +392,31 @@ SRD_API int srd_decoder_load(const char *module_name)
 		}
 	}
 
+	/* 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);
+			goto err_out;
+		}
+		len = PyTuple_Size(py_bin_classes);
+		for (i = 0; i < len; 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);
+				goto err_out;
+			}
+
+			if (py_str_as_str(py_bin_class, &bin) != SRD_OK) {
+				goto err_out;
+			}
+			d->binary = g_slist_append(d->binary, bin);
+		}
+	}
+
 	/* Append it to the list of supported/loaded decoders. */
 	pd_list = g_slist_append(pd_list, d);
 
@@ -413,6 +449,12 @@ SRD_API char *srd_decoder_doc_get(const struct srd_decoder *dec)
 	PyObject *py_str;
 	char *doc;
 
+	if (!srd_check_init())
+		return NULL;
+
+	if (!dec)
+		return NULL;
+
 	if (!PyObject_HasAttrString(dec->py_mod, "__doc__"))
 		return NULL;
 
@@ -448,7 +490,7 @@ static void free_probes(GSList *probelist)
 }
 
 /**
- * Unload decoder module.
+ * Unload the specified protocol decoder.
  *
  * @param dec The struct srd_decoder to be unloaded.
  *
@@ -459,8 +501,15 @@ static void free_probes(GSList *probelist)
 SRD_API int srd_decoder_unload(struct srd_decoder *dec)
 {
 	struct srd_decoder_option *o;
+	struct srd_session *sess;
 	GSList *l;
 
+	if (!srd_check_init())
+		return SRD_ERR;
+
+	if (!dec)
+		return SRD_ERR_ARG;
+
 	srd_dbg("Unloading protocol decoder '%s'.", dec->name);
 
 	/*
@@ -469,7 +518,10 @@ SRD_API int srd_decoder_unload(struct srd_decoder *dec)
 	 * stack. A frontend reloading a decoder thus has to restart all
 	 * instances, and rebuild the stack.
 	 */
-	srd_inst_free_all(NULL);
+	for (l = sessions; l; l = l->next) {
+		sess = l->data;
+		srd_inst_free_all(sess, NULL);
+	}
 
 	for (l = dec->options; l; l = l->next) {
 		o = l->data;
@@ -493,7 +545,7 @@ SRD_API int srd_decoder_unload(struct srd_decoder *dec)
 	/* The module itself. */
 	Py_XDECREF(dec->py_mod);
 
-	/* TODO: (g_)free dec itself? */
+	g_free(dec);
 
 	return SRD_OK;
 }
@@ -511,6 +563,9 @@ SRD_API int srd_decoder_load_all(void)
 	GError *error;
 	const gchar *direntry;
 
+	if (!srd_check_init())
+		return SRD_ERR;
+
 	if (!(dir = g_dir_open(DECODERS_DIR, 0, &error))) {
 		srd_err("Unable to open %s for reading.", DECODERS_DIR);
 		return SRD_ERR_DECODERS_DIR;