X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sigrok-cli.c;h=70d3a59ee6cc2c3517c21baa84469619a129e255;hb=66149c2013c0009c226770e5679ae63fd834bb78;hp=a626636dd137644f3b07ce5115ce074dcd5798ec;hpb=5acb76821f33f03745e26c91fbb9cc7bcf34512a;p=sigrok-cli.git

diff --git a/sigrok-cli.c b/sigrok-cli.c
index a626636..70d3a59 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -36,6 +36,8 @@
 
 #define DEFAULT_OUTPUT_FORMAT "bits:width=64"
 
+static struct sr_context *sr_ctx = NULL;
+
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
 static struct sr_output_format *output_format = NULL;
@@ -138,6 +140,12 @@ static GSList *hash_to_hwopt(GHashTable *hash)
 	return opts;
 }
 
+static void free_hwopt(struct sr_hwopt *hwopt)
+{
+	g_free((void *)hwopt->value);
+	g_free(hwopt);
+}
+
 static GSList *device_scan(void)
 {
 	struct sr_dev_driver **drivers, *driver;
@@ -162,7 +170,7 @@ static GSList *device_scan(void)
 			return NULL;
 		}
 		g_free(drvname);
-		if (sr_driver_init(driver) != SR_OK) {
+		if (sr_driver_init(sr_ctx, driver) != SR_OK) {
 			g_critical("Failed to initialize driver.");
 			return NULL;
 		}
@@ -172,13 +180,14 @@ static GSList *device_scan(void)
 				/* Unknown options, already logged. */
 				return NULL;
 		devices = sr_driver_scan(driver, drvopts);
+		g_slist_free_full(drvopts, (GDestroyNotify)free_hwopt);
 	} else {
 		/* No driver specified, let them all scan on their own. */
 		devices = NULL;
 		drivers = sr_driver_list();
 		for (i = 0; drivers[i]; i++) {
 			driver = drivers[i];
-			if (sr_driver_init(driver) != SR_OK) {
+			if (sr_driver_init(sr_ctx, driver) != SR_OK) {
 				g_critical("Failed to initialize driver.");
 				return NULL;
 			}
@@ -194,7 +203,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;
@@ -438,7 +447,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) {
@@ -538,22 +547,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;
@@ -717,14 +722,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) {
@@ -821,7 +818,6 @@ static int register_pds(struct sr_dev *dev, const char *pdstring)
 	int ret;
 	char **pdtokens, **pdtok, *pd_name;
 
-	/* Avoid compiler warnings. */
 	(void)dev;
 
 	ret = 0;
@@ -1287,8 +1283,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;
@@ -1458,7 +1452,6 @@ static void run_session(void)
 static void logger(const gchar *log_domain, GLogLevelFlags log_level,
 		   const gchar *message, gpointer cb_data)
 {
-	/* Avoid compiler warnings. */
 	(void)log_domain;
 	(void)cb_data;
 
@@ -1478,7 +1471,6 @@ int main(int argc, char **argv)
 	int ret = 1;
 	GOptionContext *context;
 	GError *error;
-	struct sr_context *sr_ctx = NULL;
 
 	g_log_set_default_handler(logger, NULL);