X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=dda4343f16292b8a4fb6f6b74609491976986082;hp=780c3eb1f9ea36562458b3254e9cab6c4339d9f7;hb=2358775c24a4c10dd55b2e0c12c24d6690b23daf;hpb=d26d259ff46e95a230d2c66bc0e1456655ac0480

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 780c3eb..dda4343 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -93,6 +93,7 @@ static void show_version(void)
 	int i;
 
 	printf("sigrok-cli %s\n\n", VERSION);
+
 	printf("Supported hardware drivers:\n");
 	plugins = sr_hwplugins_list();
 	for (p = plugins; p; p = p->next) {
@@ -113,17 +114,17 @@ static void show_version(void)
 		printf("  %-20s %s\n", outputs[i]->id, outputs[i]->description);
 	printf("\n");
 
-	/* TODO: Error handling. */
-	srd_init(NULL);
-
-	printf("Supported protocol decoders:\n");
-	for (l = srd_list_decoders(); l; l = l->next) {
-		dec = l->data;
-		printf("  %-20s %s\n", dec->id, dec->longname);
+	if (srd_init(NULL) == SRD_OK) {
+		printf("Supported protocol decoders:\n");
+		srd_decoders_load_all();
+		for (l = srd_decoders_list(); l; l = l->next) {
+			dec = l->data;
+			printf("  %-20s %s\n", dec->id, dec->longname);
+		}
+		srd_exit();
 	}
 	printf("\n");
 
-	srd_exit();
 }
 
 static void print_device_line(const struct sr_device *device)
@@ -265,7 +266,7 @@ static void show_pd_detail(void)
 
 	pdtokens = g_strsplit(opt_pds, ",", -1);
 	for (pdtok = pdtokens; *pdtok; pdtok++) {
-		if (!(dec = srd_get_decoder_by_id(*pdtok))) {
+		if (!(dec = srd_decoder_get_by_id(*pdtok))) {
 			printf("Protocol decoder %s not found.", *pdtok);
 			return;
 		}
@@ -484,8 +485,12 @@ static int register_pds(struct sr_device *device, const char *pdstring)
 
 		pd_name = g_strdup(g_hash_table_lookup(pd_opthash, "sigrok_key"));
 		g_hash_table_remove(pd_opthash, "sigrok_key");
+		if (srd_decoder_load(pd_name) != SRD_OK) {
+			fprintf(stderr, "Failed to load protocol decoder %s\n", pd_name);
+			goto err_out;
+		}
 		if (!(di = srd_inst_new(pd_name, pd_opthash))) {
-			fprintf(stderr, "Failed to instantiate PD %s\n", pd_name);
+			fprintf(stderr, "Failed to instantiate protocol decoder %s\n", pd_name);
 			goto err_out;
 		}
 		g_datalist_set_data(&pd_ann_visible, di->inst_id, pd_name);
@@ -494,7 +499,7 @@ static int register_pds(struct sr_device *device, const char *pdstring)
 		 * is the probe name as specified in the decoder class, and the
 		 * value is the probe number i.e. the order in which the PD's
 		 * incoming samples are arranged. */
-		if (srd_inst_set_probes(di, pd_opthash) != SRD_OK)
+		if (srd_inst_probes_set(di, pd_opthash) != SRD_OK)
 			goto err_out;
 		g_hash_table_destroy(pd_opthash);
 		pd_opthash = NULL;