X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=b3d39ff8ac1f35d58dc978ed73caab41898794fc;hp=f1542357ffc6a22605669cf5e1674bf3a3baf7c5;hb=cfad6a304754649dbd8841af8a15ddba16a69cc6;hpb=e8a9eb8d33617a5210a1c10d1855a8482bd85080

diff --git a/session.c b/session.c
index f154235..b3d39ff 100644
--- a/session.c
+++ b/session.c
@@ -101,9 +101,11 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi, FILE
 	g_hash_table_remove(fmtargs, "sigrok_key");
 	if ((options = sr_output_options_get(omod))) {
 		fmtopts = generic_arg_to_opt(options, fmtargs);
+		(void)warn_unknown_keys(options, fmtargs, NULL);
 		sr_output_options_free(options);
-	} else
+	} else {
 		fmtopts = NULL;
+	}
 	o = sr_output_new(omod, fmtopts, sdi, opt_output_file);
 
 	if (opt_output_file) {
@@ -145,9 +147,11 @@ const struct sr_transform *setup_transform_module(const struct sr_dev_inst *sdi)
 	g_hash_table_remove(fmtargs, "sigrok_key");
 	if ((options = sr_transform_options_get(tmod))) {
 		fmtopts = generic_arg_to_opt(options, fmtargs);
+		(void)warn_unknown_keys(options, fmtargs, NULL);
 		sr_transform_options_free(options);
-	} else
+	} else {
 		fmtopts = NULL;
+	}
 	t = sr_transform_new(tmod, fmtopts, sdi);
 	if (fmtopts)
 		g_hash_table_destroy(fmtopts);
@@ -324,6 +328,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 					g_critical("Failed to configure decode session.");
 					break;
 				}
+				pd_samplerate = samplerate;
 			}
 			if (srd_session_start(srd_sess) != SRD_OK) {
 				g_critical("Failed to start decode session.");
@@ -352,6 +357,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 							g_variant_new_uint64(samplerate)) != SRD_OK) {
 						g_critical("Failed to pass samplerate to decoder.");
 					}
+					pd_samplerate = samplerate;
 				}
 #endif
 				break;
@@ -660,7 +666,7 @@ int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
 	while (g_hash_table_iter_next(&iter, &key, &value)) {
 		if ((ret = opt_to_gvar(key, value, &src)) != 0)
 			return ret;
-		cg = select_channel_group(sdi);
+		cg = lookup_channel_group(sdi);
 		if ((ret = maybe_config_set(sr_dev_inst_driver_get(sdi), sdi, cg,
 				src.key, src.data)) != SR_OK) {
 			g_critical("Failed to set device option '%s': %s.",