X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=device.c;h=90c9fc349449d0e0e183cddf1e333adecd1b687c;hp=2dc830817df44c4eab739421a275b269e4a73a1b;hb=a8b4041ad4829aeb33e243d6a6a0c482be4658cd;hpb=2be182e6437fb082aedca653fdc106d702518db0

diff --git a/device.c b/device.c
index 2dc8308..90c9fc3 100644
--- a/device.c
+++ b/device.c
@@ -17,36 +17,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "sigrok-cli.h"
 #include "config.h"
 #include <glib.h>
-#include <libsigrok/libsigrok.h>
-#include "sigrok-cli.h"
+#include <string.h>
 
 extern struct sr_context *sr_ctx;
-extern gchar *opt_drv;
-extern gchar *opt_probe_group;
 
 /* Convert driver options hash to GSList of struct sr_config. */
 static GSList *hash_to_hwopt(GHashTable *hash)
 {
-	const struct sr_config_info *srci;
 	struct sr_config *src;
 	GList *gl, *keys;
 	GSList *opts;
-	char *key, *value;
+	char *key;
 
 	keys = g_hash_table_get_keys(hash);
 	opts = NULL;
 	for (gl = keys; gl; gl = gl->next) {
 		key = gl->data;
-		if (!(srci = sr_config_info_name_get(key))) {
-			g_critical("Unknown option %s", key);
+		src = g_malloc(sizeof(struct sr_config));
+		if (opt_to_gvar(key, g_hash_table_lookup(hash, key), src) != 0)
 			return NULL;
-		}
-		src = g_try_malloc(sizeof(struct sr_config));
-		src->key = srci->key;
-		value = g_hash_table_lookup(hash, key);
-		src->data = g_variant_new_string(value);
 		opts = g_slist_append(opts, src);
 	}
 	g_list_free(keys);
@@ -122,23 +114,23 @@ GSList *device_scan(void)
 	return devices;
 }
 
-struct sr_probe_group *select_probe_group(struct sr_dev_inst *sdi)
+struct sr_channel_group *select_channel_group(struct sr_dev_inst *sdi)
 {
-	struct sr_probe_group *pg;
+	struct sr_channel_group *cg;
 	GSList *l;
 
-	if (!opt_probe_group)
+	if (!opt_channel_group)
 		return NULL;
 
-	if (!sdi->probe_groups) {
-		g_critical("This device does not have any probe groups.");
+	if (!sdi->channel_groups) {
+		g_critical("This device does not have any channel groups.");
 		return NULL;
 	}
 
-	for (l = sdi->probe_groups; l; l = l->next) {
-		pg = l->data;
-		if (!strcasecmp(opt_probe_group, pg->name)) {
-			return pg;
+	for (l = sdi->channel_groups; l; l = l->next) {
+		cg = l->data;
+		if (!strcasecmp(opt_channel_group, cg->name)) {
+			return cg;
 		}
 	}