From 905766867972aa1177cf6a23f42d0ceda096bbc8 Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Tue, 24 Jan 2012 02:04:14 +0100 Subject: [PATCH 1/1] cli: when deciding which PD's output to show, use instance id --- sigrok-cli.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } -- 2.30.2