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

diff --git a/sigrok-cli.c b/sigrok-cli.c
index ccfc5e0..c64b001 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -1267,7 +1267,7 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
 			ret = SR_ERR;
 		}
 		if (val)
-			ret = sdi->driver->dev_config_set(sdi, hwo->hwcap, 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;
@@ -1292,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;
@@ -1315,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;
@@ -1383,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.");
@@ -1407,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();
@@ -1417,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;