X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=device.c;h=7da744431154c134b5bee897bc24f817cc774e46;hp=141e3cfd2c9edb35887c02a0a2ff3acb891c4f2c;hb=7ce834c1166fcf57ebb0e20bf4e7ba9e856aa6ce;hpb=9a6e8ec4bc84d94e27c9a004a7b75caaa0ba7124

diff --git a/device.c b/device.c
index 141e3cf..7da7444 100644
--- a/device.c
+++ b/device.c
@@ -66,22 +66,31 @@ GSList *device_scan(void)
 /**
  * Lookup a channel group from its name.
  *
- * Uses the previously stored option value to lookup a channel group.
- * Returns a reference to the channel group when the lookup succeeded,
- * or #NULL after lookup failure, or #NULL for the global channel group
- * (the device's global parameters). Emits an error message when the
- * lookup failed while a channel group's name was specified.
+ * Uses the caller specified channel group name, or a previously stored
+ * option value as a fallback. Returns a reference to the channel group
+ * when the lookup succeeded, or #NULL after lookup failure, as well as
+ * #NULL for the global channel group (the device).
+ *
+ * Accepts either #NULL pointer, or an empty string, or the "global"
+ * literal to address the global channel group (the device). Emits an
+ * error message when the lookup failed while a name was specified.
  *
  * @param[in] sdi Device instance.
+ * @param[in] cg_name Caller provided channel group name.
  *
  * @returns The channel group, or #NULL for failed lookup.
  */
-struct sr_channel_group *lookup_channel_group(struct sr_dev_inst *sdi)
+struct sr_channel_group *lookup_channel_group(struct sr_dev_inst *sdi,
+	const char *cg_name)
 {
 	struct sr_channel_group *cg;
 	GSList *l, *channel_groups;
 
-	if (!opt_channel_group)
+	if (!cg_name)
+		cg_name = opt_channel_group;
+	if (cg_name && g_ascii_strcasecmp(cg_name, "global") == 0)
+		cg_name = NULL;
+	if (!cg_name || !*cg_name)
 		return NULL;
 
 	channel_groups = sr_dev_inst_channel_groups_get(sdi);
@@ -92,11 +101,11 @@ struct sr_channel_group *lookup_channel_group(struct sr_dev_inst *sdi)
 
 	for (l = channel_groups; l; l = l->next) {
 		cg = l->data;
-		if (g_ascii_strcasecmp(opt_channel_group, cg->name) != 0)
+		if (g_ascii_strcasecmp(cg_name, cg->name) != 0)
 			continue;
 		return cg;
 	}
-	g_critical("Invalid channel group '%s'", opt_channel_group);
+	g_critical("Invalid channel group '%s'", cg_name);
 
 	return NULL;
 }