X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=bb9305f6d521061dde7dac0966bab78735355e0c;hp=d4a694d1334f9fc762ecefd216404b7ce5c25e2b;hb=e54290bdb3429a30f06231976980652af3360b0c;hpb=6b0462c2e0bcad51f759ec2efa417a137e8ca8c6 diff --git a/sigrok-cli.c b/sigrok-cli.c index d4a694d..bb9305f 100644 --- a/sigrok-cli.c +++ b/sigrok-cli.c @@ -440,7 +440,7 @@ static void show_dev_detail(void) printf(" %s\n", stropts[i]); } else if (hwo->hwcap == SR_HWCAP_FILTER) { - /* Supported trigger sources */ + /* Supported filters */ printf(" %s", hwo->shortname); if (sr_info_get(sdi->driver, SR_DI_FILTERS, (const void **)&stropts, sdi) != SR_OK) { @@ -544,18 +544,14 @@ static void datafeed_in(const struct sr_dev_inst *sdi, { static struct sr_output *o = NULL; static int logic_probelist[SR_MAX_NUM_PROBES] = { -1 }; - static struct sr_probe *analog_probelist[SR_MAX_NUM_PROBES]; static uint64_t received_samples = 0; static int unitsize = 0; static int triggered = 0; static FILE *outfile = NULL; - static int num_analog_probes = 0; struct sr_probe *probe; const struct sr_datafeed_logic *logic; const struct sr_datafeed_meta_logic *meta_logic; const struct sr_datafeed_analog *analog; - const struct sr_datafeed_meta_analog *meta_analog; - static int num_enabled_analog_probes = 0; int num_enabled_probes, sample_size, ret, i; uint64_t output_len, filter_out_len; uint8_t *output_buf, *filter_out; @@ -719,14 +715,6 @@ static void datafeed_in(const struct sr_dev_inst *sdi, case SR_DF_META_ANALOG: g_message("cli: Received SR_DF_META_ANALOG"); - meta_analog = packet->payload; - num_analog_probes = meta_analog->num_probes; - num_enabled_analog_probes = 0; - for (i = 0; i < num_analog_probes; i++) { - probe = g_slist_nth_data(sdi->probes, i); - if (probe->enabled) - analog_probelist[num_enabled_analog_probes++] = probe; - } outfile = stdout; if (opt_output_file) {