X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoder.c;h=9990e2998e14bdfff730d05170f39e7c078fa277;hb=a0128522e5fb4ee50fe10450ad8255cd1729bde4;hp=1151f057f2b5c3e2d4fa5f05ed0fda10cb7e7df6;hpb=95e40a0ce2e27ba6ea7c97d9956918336160bf7b;p=libsigrokdecode.git

diff --git a/decoder.c b/decoder.c
index 1151f05..9990e29 100644
--- a/decoder.c
+++ b/decoder.c
@@ -682,8 +682,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 != 2 && apiver != 3) {
+		srd_exception_catch("Only PD API version 2/3 is supported, "
 			"decoder %s has version %ld", module_name, apiver);
 		fail_txt = "API version mismatch";
 		goto err_out;
@@ -767,13 +767,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 +848,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. */