From: Bert Vermeulen <redacted>
Date: Tue, 24 Jan 2012 01:04:14 +0000 (+0100)
Subject: cli: when deciding which PD's output to show, use instance id
X-Git-Tag: sigrok-cli-0.3.0~58
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=commitdiff_plain;h=905766867972aa1177cf6a23f42d0ceda096bbc8

cli: when deciding which PD's output to show, use instance id
---

diff --git a/sigrok-cli.c b/sigrok-cli.c
index c50d064..0b5a01f 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -494,7 +494,7 @@ static int register_pds(struct sr_device *device, const char *pdstring)
 			fprintf(stderr, "Failed to instantiate PD %s\n", pd_name);
 			goto err_out;
 		}
-		g_datalist_set_data(&pd_ann_visible, pd_name, pd_name);
+		g_datalist_set_data(&pd_ann_visible, di->instance_id, pd_name);
 	}
 
 	/* Any keys left in the options hash are probes, where the key
@@ -525,7 +525,7 @@ void show_pd_annotation(struct srd_proto_data *pdata)
 		return;
 	}
 
-	if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->proto_id)) {
+	if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->di->instance_id)) {
 		/* not in the list of PDs whose annotations we're showing */
 		return;
 	}