X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=c64b001dd4c05c7cc388e3bb46314cb74fc94740;hp=260cb9bfabfc030fab51849310a318f23cb29198;hb=5c730c7bc889f1acd5db7563d9778478b2ceb0a6;hpb=5d1fb573ad452a5f32d92a291775db07f238aba0

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 260cb9b..c64b001 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -36,9 +36,6 @@
 
 #define DEFAULT_OUTPUT_FORMAT "bits:width=64"
 
-extern struct sr_hwcap_option sr_drvopts[];
-extern struct sr_hwcap_option sr_hwcap_options[];
-
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
 static struct sr_output_format *output_format = NULL;
@@ -116,7 +113,7 @@ static GOptionEntry optargs[] = {
 /* Convert driver options hash to GSList of struct sr_hwopt. */
 static GSList *hash_to_hwopt(GHashTable *hash)
 {
-	struct sr_hwcap_option *ho;
+	const struct sr_hwcap_option *hwo;
 	struct sr_hwopt *hwopt;
 	GList *gl, *keys;
 	GSList *opts;
@@ -126,20 +123,16 @@ static GSList *hash_to_hwopt(GHashTable *hash)
 	opts = NULL;
 	for (gl = keys; gl; gl = gl->next) {
 		key = gl->data;
-		for (ho = sr_drvopts; ho->shortname; ho++) {
-			if (!strcmp(key, ho->shortname)) {
-				hwopt = g_try_malloc(sizeof(struct sr_hwopt));
-				hwopt->hwopt = ho->hwcap;
-				value = g_hash_table_lookup(hash, key);
-				hwopt->value = g_strdup(value);
-				opts = g_slist_append(opts, hwopt);
-				break;
-			}
-		}
-		if (!ho->shortname) {
+		if (!(hwo = sr_drvopt_name_get(key))) {
 			g_critical("Unknown option %s", key);
 			return NULL;
 		}
+		hwopt = g_try_malloc(sizeof(struct sr_hwopt));
+		hwopt->hwopt = hwo->hwcap;
+		value = g_hash_table_lookup(hash, key);
+		hwopt->value = g_strdup(value);
+		opts = g_slist_append(opts, hwopt);
+		break;
 	}
 	g_list_free(keys);
 
@@ -1216,77 +1209,71 @@ static void load_input_file(void)
 
 static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
 {
+	const struct sr_hwcap_option *hwo;
 	GHashTableIter iter;
 	gpointer key, value;
-	int ret, i;
+	int ret;
 	float tmp_float;
 	uint64_t tmp_u64;
 	struct sr_rational tmp_rat;
 	gboolean tmp_bool;
-	gboolean found;
 	void *val;
 
 	g_hash_table_iter_init(&iter, args);
 	while (g_hash_table_iter_next(&iter, &key, &value)) {
-		found = FALSE;
-		for (i = 0; sr_hwcap_options[i].hwcap; i++) {
-			if (strcmp(sr_hwcap_options[i].shortname, key))
-				continue;
-			if ((value == NULL) && 
-			    (sr_hwcap_options[i].type != SR_T_BOOL)) {
-				g_critical("Option '%s' needs a value.", (char *)key);
-				return SR_ERR;
-			}
-			found = TRUE;
-			val = NULL;
-			switch (sr_hwcap_options[i].type) {
-			case SR_T_UINT64:
-				ret = sr_parse_sizestring(value, &tmp_u64);
-				if (ret != SR_OK)
-					break;
-				val = &tmp_u64;
-				break;
-			case SR_T_CHAR:
-				val = value;
-				break;
-			case SR_T_BOOL:
-				if (!value)
-					tmp_bool = TRUE;
-				else 
-					tmp_bool = sr_parse_boolstring(value);
-				val = &tmp_bool;
-				break;
-			case SR_T_FLOAT:
-				tmp_float = strtof(value, NULL);
-				val = &tmp_float;
-				break;
-			case SR_T_RATIONAL_PERIOD:
-				if ((ret = sr_parse_period(value, &tmp_rat)) != SR_OK)
-					break;
-				val = &tmp_rat;
-				break;
-			case SR_T_RATIONAL_VOLT:
-				if ((ret = sr_parse_voltage(value, &tmp_rat)) != SR_OK)
-					break;
-				val = &tmp_rat;
+		if (!(hwo = sr_devopt_name_get(key))) {
+			g_critical("Unknown device option '%s'.", (char *) key);
+			return SR_ERR;
+		}
+
+		if ((value == NULL) &&
+			(hwo->type != SR_T_BOOL)) {
+			g_critical("Option '%s' needs a value.", (char *)key);
+			return SR_ERR;
+		}
+		val = NULL;
+		switch (hwo->type) {
+		case SR_T_UINT64:
+			ret = sr_parse_sizestring(value, &tmp_u64);
+			if (ret != SR_OK)
 				break;
-			default:
-				ret = SR_ERR;
-			}
-			if (val)
-				ret = sdi->driver->dev_config_set(sdi,
-						sr_hwcap_options[i].hwcap, val);
-			if (ret != SR_OK) {
-				g_critical("Failed to set device option '%s'.", (char *)key);
-				return ret;
-			}
+			val = &tmp_u64;
+			break;
+		case SR_T_CHAR:
+			val = value;
+			break;
+		case SR_T_BOOL:
+			if (!value)
+				tmp_bool = TRUE;
 			else
+				tmp_bool = sr_parse_boolstring(value);
+			val = &tmp_bool;
+			break;
+		case SR_T_FLOAT:
+			tmp_float = strtof(value, NULL);
+			val = &tmp_float;
+			break;
+		case SR_T_RATIONAL_PERIOD:
+			if ((ret = sr_parse_period(value, &tmp_rat)) != SR_OK)
 				break;
+			val = &tmp_rat;
+			break;
+		case SR_T_RATIONAL_VOLT:
+			if ((ret = sr_parse_voltage(value, &tmp_rat)) != SR_OK)
+				break;
+			val = &tmp_rat;
+			break;
+		default:
+			ret = SR_ERR;
 		}
-		if (!found) {
-			g_critical("Unknown device option '%s'.", (char *) key);
-			return SR_ERR;
+		if (val)
+			ret = sr_dev_config_set(sdi, hwo->hwcap, val);
+		if (ret != SR_OK) {
+			g_critical("Failed to set device option '%s'.", (char *)key);
+			return ret;
 		}
+		else
+			break;
 	}
 
 	return SR_OK;
@@ -1305,8 +1292,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 	}
 
 	if (sr_driver_hwcap_exists(sdi->driver, SR_HWCAP_LIMIT_MSEC)) {
-		if (sdi->driver->dev_config_set(sdi,
-			SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
+		if (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
 			g_critical("Failed to configure time limit.");
 			sr_session_destroy();
 			return SR_ERR;
@@ -1328,8 +1314,8 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 			return SR_ERR;
 		}
 
-		if (sdi->driver->dev_config_set(sdi,
-			SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) {
+		if (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES,
+					&limit_samples) != SR_OK) {
 			g_critical("Failed to configure time-based sample limit.");
 			sr_session_destroy();
 			return SR_ERR;
@@ -1361,6 +1347,12 @@ static void run_session(void)
 	sr_session_new();
 	sr_session_datafeed_callback_add(datafeed_in);
 
+	if (sr_session_dev_add(sdi) != SR_OK) {
+		g_critical("Failed to use device.");
+		sr_session_destroy();
+		return;
+	}
+
 	if (opt_dev) {
 		if ((devargs = parse_generic_arg(opt_dev, FALSE))) {
 			if (set_dev_options(sdi, devargs) != SR_OK)
@@ -1369,12 +1361,6 @@ static void run_session(void)
 		}
 	}
 
-	if (sr_session_dev_add(sdi) != SR_OK) {
-		g_critical("Failed to use device.");
-		sr_session_destroy();
-		return;
-	}
-
 	if (select_probes(sdi) != SR_OK) {
 		g_critical("Failed to set probes.");
 		sr_session_destroy();
@@ -1396,13 +1382,6 @@ static void run_session(void)
 		g_free(triggerlist);
 	}
 
-	if (sdi->driver->dev_config_set(sdi, SR_HWCAP_PROBECONFIG,
-			(char *)sdi->probes) != SR_OK) {
-		g_critical("Failed to configure probes.");
-		sr_session_destroy();
-		return;
-	}
-
 	if (opt_continuous) {
 		if (!sr_driver_hwcap_exists(sdi->driver, SR_HWCAP_CONTINUOUS)) {
 			g_critical("This device does not support continuous sampling.");
@@ -1420,7 +1399,7 @@ static void run_session(void)
 
 	if (opt_samples) {
 		if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)
-				|| (sdi->driver->dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES,
+				|| (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES,
 						&limit_samples) != SR_OK)) {
 			g_critical("Failed to configure sample limit.");
 			sr_session_destroy();
@@ -1430,8 +1409,8 @@ static void run_session(void)
 
 	if (opt_frames) {
 		if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK)
-				|| (sdi->driver->dev_config_set(sdi,
-			    SR_HWCAP_LIMIT_FRAMES, &limit_frames) != SR_OK)) {
+				|| (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_FRAMES,
+						&limit_frames) != SR_OK)) {
 			g_critical("Failed to configure frame limit.");
 			sr_session_destroy();
 			return;