X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=c5eb7aad3988e2ad67f8aae3725c5024f8f419c1;hp=f71f999bd10491449b191e14786d62f9edb28eb6;hb=196e1a9c176c1bf5224ca4d97cb0ae56995e5b14;hpb=fd65ec4c9c349a9ed240fedf69946abea7afd047

diff --git a/session.c b/session.c
index f71f999..c5eb7aa 100644
--- a/session.c
+++ b/session.c
@@ -45,14 +45,15 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 		return SR_ERR;
 	}
 
-	if (config_key_has_cap(driver, sdi, NULL, SR_CONF_LIMIT_MSEC, SR_CONF_SET)) {
+	if (sr_dev_config_capabilities_list(sdi, NULL, SR_CONF_LIMIT_MSEC)
+			& SR_CONF_SET) {
 		gvar = g_variant_new_uint64(time_msec);
 		if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_MSEC, gvar) != SR_OK) {
 			g_critical("Failed to configure time limit.");
 			return SR_ERR;
 		}
-	} else if (config_key_has_cap(driver, sdi, NULL, SR_CONF_SAMPLERATE,
-			SR_CONF_GET | SR_CONF_SET)) {
+	} else if (sr_dev_config_capabilities_list(sdi, NULL, SR_CONF_SAMPLERATE)
+			& (SR_CONF_GET | SR_CONF_SET)) {
 		/* Convert to samples based on the samplerate. */
 		sr_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar);
 		samplerate = g_variant_get_uint64(gvar);
@@ -129,9 +130,6 @@ const struct sr_transform *setup_transform_module(const struct sr_dev_inst *sdi)
 	GHashTable *fmtargs, *fmtopts;
 	char *fmtspec;
 
-	if (!opt_transform_module)
-		opt_transform_module = "nop";
-
 	fmtargs = parse_generic_arg(opt_transform_module, TRUE);
 	fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
 	if (!fmtspec)
@@ -155,11 +153,6 @@ const struct sr_transform *setup_transform_module(const struct sr_dev_inst *sdi)
 void datafeed_in(const struct sr_dev_inst *sdi,
 		const struct sr_datafeed_packet *packet, void *cb_data)
 {
-	const struct sr_datafeed_meta *meta;
-	const struct sr_datafeed_logic *logic;
-	const struct sr_datafeed_analog *analog;
-	struct sr_session *session;
-	struct sr_config *src;
 	static const struct sr_output *o = NULL;
 	static const struct sr_output *oa = NULL;
 	static uint64_t rcvd_samples_logic = 0;
@@ -167,6 +160,12 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	static uint64_t samplerate = 0;
 	static int triggered = 0;
 	static FILE *outfile = NULL;
+
+	const struct sr_datafeed_meta *meta;
+	const struct sr_datafeed_logic *logic;
+	const struct sr_datafeed_analog *analog;
+	struct sr_session *session;
+	struct sr_config *src;
 	GSList *l;
 	GString *out;
 	GVariant *gvar;
@@ -174,9 +173,13 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	uint64_t input_len;
 	struct sr_dev_driver *driver;
 
+	/* Avoid warnings when building without decoder support. */
+	(void)session;
+	(void)input_len;
+
 	driver = sr_dev_inst_driver_get(sdi);
 
-	/* If the first packet to come in isn't a header, don't even try. */
+	/* Skip all packets before the first header. */
 	if (packet->type != SR_DF_HEADER && !o)
 		return;
 
@@ -188,7 +191,9 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 			g_critical("Failed to initialize output module.");
 
 		/* Set up backup analog output module. */
-		oa = sr_output_new(sr_output_find("analog"), NULL, sdi, NULL);
+		if (outfile)
+			oa = sr_output_new(sr_output_find("analog"), NULL,
+					sdi, NULL);
 
 		rcvd_samples_logic = rcvd_samples_analog = 0;
 
@@ -306,9 +311,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 
 	if (o && !opt_pds) {
 		if (sr_output_send(o, packet, &out) == SR_OK) {
-			if (!out || (out->len == 0
-					&& !opt_output_format
-					&& packet->type == SR_DF_ANALOG)) {
+			if (oa && !out) {
 				/*
 				 * The user didn't specify an output module,
 				 * but needs to see this analog data.
@@ -335,7 +338,8 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 			sr_output_free(o);
 		o = NULL;
 
-		sr_output_free(oa);
+		if (oa)
+			sr_output_free(oa);
 		oa = NULL;
 
 		if (outfile && outfile != stdout)
@@ -526,8 +530,8 @@ void run_session(void)
 	struct sr_trigger *trigger;
 	struct sr_dev_inst *sdi;
 	uint64_t min_samples, max_samples;
-	gsize n_elements, i;
-	const uint32_t *dev_opts;
+	GArray *drv_opts;
+	guint i;
 	int is_demo_dev;
 	struct sr_dev_driver *driver;
 	const struct sr_transform *t;
@@ -545,20 +549,18 @@ void run_session(void)
 
 		driver = sr_dev_inst_driver_get(sdi);
 
-		if (sr_config_list(driver, sdi, NULL, SR_CONF_DEVICE_OPTIONS, &gvar) != SR_OK) {
-			g_critical("Failed to query list device options.");
+		if (!(drv_opts = sr_dev_options(driver, NULL, NULL))) {
+			g_critical("Failed to query list of driver options.");
 			return;
 		}
 
-		dev_opts = g_variant_get_fixed_array(gvar, &n_elements, sizeof(uint32_t));
-
 		is_demo_dev = 0;
-		for (i = 0; i < n_elements; i++) {
-			if (dev_opts[i] == SR_CONF_DEMO_DEV)
+		for (i = 0; i < drv_opts->len; i++) {
+			if (g_array_index(drv_opts, uint32_t, i) == SR_CONF_DEMO_DEV)
 				is_demo_dev = 1;
 		}
 
-		g_variant_unref(gvar);
+		g_array_free(drv_opts, TRUE);
 
 		if (!is_demo_dev)
 			real_devices = g_slist_append(real_devices, sdi);
@@ -576,12 +578,18 @@ void run_session(void)
 		}
 	}
 
+	/* This is unlikely to happen but it makes static analyzers stop complaining. */
+	if (!devices) {
+		g_critical("No real devices found.");
+		return;
+	}
+
 	sdi = devices->data;
 	g_slist_free(devices);
 	g_slist_free(real_devices);
 
 	sr_session_new(sr_ctx, &session);
-	sr_session_datafeed_callback_add(session, datafeed_in, NULL);
+	sr_session_datafeed_callback_add(session, datafeed_in, session);
 
 	if (sr_dev_open(sdi) != SR_OK) {
 		g_critical("Failed to open device.");
@@ -668,7 +676,7 @@ void run_session(void)
 
 	if (opt_frames) {
 		if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK)) {
-			g_critical("Invalid sample limit '%s'.", opt_samples);
+			g_critical("Invalid frame limit '%s'.", opt_frames);
 			sr_session_destroy(session);
 			return;
 		}
@@ -680,8 +688,10 @@ void run_session(void)
 		}
 	}
 
-	if (!(t = setup_transform_module(sdi)))
-		g_critical("Failed to initialize transform module.");
+	if (opt_transform_module) {
+		if (!(t = setup_transform_module(sdi)))
+			g_critical("Failed to initialize transform module.");
+	}
 
 	main_loop = g_main_loop_new(NULL, FALSE);