X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=93738c4de908956ded5ce4942878251d1b2434d9;hp=367353623a124cb30def0e9bd3a9e3b653a53b0c;hb=399a57f9a6cb517bbed9b2ef3ca7c05d1b99cd7d;hpb=e2fe62cc46b53689105f2434c35cabb238f369b0

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 3673536..93738c4 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -196,7 +196,7 @@ static GSList *device_scan(void)
 
 static void show_version(void)
 {
-	GSList *l;
+	const GSList *l;
 	struct sr_dev_driver **drivers;
 	struct sr_input_format **inputs;
 	struct sr_output_format **outputs;
@@ -540,22 +540,18 @@ static void show_pd_detail(void)
 }
 
 static void datafeed_in(const struct sr_dev_inst *sdi,
-		struct sr_datafeed_packet *packet)
+		const struct sr_datafeed_packet *packet)
 {
 	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;
-	struct sr_datafeed_logic *logic;
-	struct sr_datafeed_meta_logic *meta_logic;
-	struct sr_datafeed_analog *analog;
-	struct sr_datafeed_meta_analog *meta_analog;
-	static int num_enabled_analog_probes = 0;
+	const struct sr_datafeed_logic *logic;
+	const struct sr_datafeed_meta_logic *meta_logic;
+	const struct sr_datafeed_analog *analog;
 	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) {
@@ -1288,8 +1276,6 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
 			g_critical("Failed to set device option '%s'.", (char *)key);
 			return ret;
 		}
-		else
-			break;
 	}
 
 	return SR_OK;