X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoder.c;h=d7395a679eb3d0bac8d9d91a2073cadd4490a1f9;hb=a912e8cbb6ab4a56bee71a9c0fd0045d5fdee55c;hp=eba5a287f4176008aed1568d465a13018c6be866;hpb=6069768266f3bdd8cddd64ba33666f05e7fff55b;p=libsigrokdecode.git

diff --git a/decoder.c b/decoder.c
index eba5a28..d7395a6 100644
--- a/decoder.c
+++ b/decoder.c
@@ -165,6 +165,8 @@ static void decoder_free(struct srd_decoder *dec)
 	g_slist_free_full(dec->opt_channels, &channel_free);
 	g_slist_free_full(dec->channels, &channel_free);
 
+	g_slist_free_full(dec->outputs, g_free);
+	g_slist_free_full(dec->inputs, g_free);
 	g_free(dec->license);
 	g_free(dec->desc);
 	g_free(dec->longname);
@@ -592,6 +594,8 @@ static int check_method(PyObject *py_dec, const char *mod_name,
  * @param d The decoder to use. Must not be NULL.
  *
  * @return The API version of the decoder, or 0 upon errors.
+ *
+ * @private
  */
 SRD_PRIV long srd_decoder_apiver(const struct srd_decoder *d)
 {
@@ -682,8 +686,8 @@ SRD_API int srd_decoder_load(const char *module_name)
 	 * PDs of different API versions are incompatible and cannot work.
 	 */
 	apiver = srd_decoder_apiver(d);
-	if (apiver != 2) {
-		srd_exception_catch("Only PD API version 2 is supported, "
+	if (apiver != 3) {
+		srd_exception_catch("Only PD API version 3 is supported, "
 			"decoder %s has version %ld", module_name, apiver);
 		fail_txt = "API version mismatch";
 		goto err_out;
@@ -727,6 +731,16 @@ SRD_API int srd_decoder_load(const char *module_name)
 		goto err_out;
 	}
 
+	if (py_attr_as_strlist(d->py_dec, "inputs", &(d->inputs)) != SRD_OK) {
+		fail_txt = "missing or malformed 'inputs' attribute";
+		goto err_out;
+	}
+
+	if (py_attr_as_strlist(d->py_dec, "outputs", &(d->outputs)) != SRD_OK) {
+		fail_txt = "missing or malformed 'outputs' attribute";
+		goto err_out;
+	}
+
 	/* All options and their default values. */
 	if (get_options(d) != SRD_OK) {
 		fail_txt = "cannot get options";
@@ -767,13 +781,12 @@ SRD_API int srd_decoder_load(const char *module_name)
 	return SRD_OK;
 
 except_out:
-	if (fail_txt) {
+	/* Don't show a message for the "common" directory, it's not a PD. */
+	if (strcmp(module_name, "common")) {
 		srd_exception_catch("Failed to load decoder %s: %s",
 				    module_name, fail_txt);
-		fail_txt = NULL;
-	} else {
-		srd_exception_catch("Failed to load decoder %s", module_name);
 	}
+	fail_txt = NULL;
 err_out:
 	if (fail_txt)
 		srd_err("Failed to load decoder %s: %s", module_name, fail_txt);
@@ -849,7 +862,7 @@ SRD_API int srd_decoder_unload(struct srd_decoder *dec)
 	 */
 	for (l = sessions; l; l = l->next) {
 		sess = l->data;
-		srd_inst_free_all(sess, NULL);
+		srd_inst_free_all(sess);
 	}
 
 	/* Remove the PD from the list of loaded decoders. */
@@ -992,13 +1005,7 @@ SRD_API int srd_decoder_load_all(void)
  */
 SRD_API int srd_decoder_unload_all(void)
 {
-	GSList *l;
-	struct srd_decoder *dec;
-
-	for (l = pd_list; l; l = l->next) {
-		dec = l->data;
-		srd_decoder_unload(dec);
-	}
+	g_slist_foreach(pd_list, (GFunc)srd_decoder_unload, NULL);
 	g_slist_free(pd_list);
 	pd_list = NULL;