cli: when deciding which PD's output to show, use instance id
authorBert Vermeulen <bert@biot.com>
Tue, 24 Jan 2012 01:04:14 +0000 (02:04 +0100)
committerBert Vermeulen <bert@biot.com>
Tue, 24 Jan 2012 01:04:14 +0000 (02:04 +0100)
sigrok-cli.c

index c50d064a63a75b2142beaf1e94bb18b4fdc90779..0b5a01fbcb6464b013f9bcde9574d54aee01b49d 100644 (file)
@@ -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;
        }