X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=5e096cd32f39d5e7edc9be45a87f9d8e81ba8f50;hp=6e101784606dc4d168a824be891f48413ceffb33;hb=a663411b8f15f3933caa0629414cf5b994f299c4;hpb=e950559979908f828a903ede8a50bde091566eed

diff --git a/session.c b/session.c
index 6e10178..5e096cd 100644
--- a/session.c
+++ b/session.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <string.h>
@@ -44,14 +45,15 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 		return SR_ERR;
 	}
 
-	if (config_key_has_cap(driver, sdi, NULL, SR_CONF_LIMIT_MSEC, SR_CONF_SET)) {
+	if (sr_dev_config_capabilities_list(sdi, NULL, SR_CONF_LIMIT_MSEC)
+			& SR_CONF_SET) {
 		gvar = g_variant_new_uint64(time_msec);
 		if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_MSEC, gvar) != SR_OK) {
 			g_critical("Failed to configure time limit.");
 			return SR_ERR;
 		}
-	} else if (config_key_has_cap(driver, sdi, NULL, SR_CONF_SAMPLERATE,
-			SR_CONF_GET | SR_CONF_SET)) {
+	} else if (sr_dev_config_capabilities_list(sdi, NULL, SR_CONF_SAMPLERATE)
+			& (SR_CONF_GET | SR_CONF_SET)) {
 		/* Convert to samples based on the samplerate. */
 		sr_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar);
 		samplerate = g_variant_get_uint64(gvar);
@@ -358,7 +360,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
 	double tmp_double, dlow, dhigh;
 	uint64_t tmp_u64, p, q, low, high, mqflags;
 	uint32_t mq;
-	GVariant *rational[2], *range[2], *gvar, *gtup[2];
+	GVariant *rational[2], *range[2], *gtup[2];
 	GVariantBuilder *vbl;
 	gboolean tmp_bool;
 	gchar **keyval;
@@ -453,7 +455,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
 			g_strfreev(keyval);
 		}
 		break;
-	case SR_T_MQLIST:
+	case SR_T_MQ:
 		/*
 		  Argument is MQ id e.g. ("voltage") optionally followed by one
 		  or more /<mqflag> e.g. "/ac".
@@ -475,12 +477,9 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
 		}
 		g_strfreev(keyval);
 		if (ret != -1) {
-			vbl = g_variant_builder_new(G_VARIANT_TYPE_ARRAY);
 			gtup[0] = g_variant_new_uint32(mq);
 			gtup[1] = g_variant_new_uint64(mqflags);
-			gvar = g_variant_new_tuple(gtup, 2);
-			g_variant_builder_add_value(vbl, gvar);
-			src->data = g_variant_builder_end(vbl);
+			src->data = g_variant_new_tuple(gtup, 2);
 		}
 		break;
 	default:
@@ -528,11 +527,12 @@ void run_session(void)
 	struct sr_trigger *trigger;
 	struct sr_dev_inst *sdi;
 	uint64_t min_samples, max_samples;
-	gsize n_elements, i;
-	const uint32_t *dev_opts;
+	GArray *dev_opts;
+	guint i;
 	int is_demo_dev;
 	struct sr_dev_driver *driver;
 	const struct sr_transform *t;
+	GMainLoop *main_loop;
 
 	devices = device_scan();
 	if (!devices) {
@@ -546,20 +546,18 @@ void run_session(void)
 
 		driver = sr_dev_inst_driver_get(sdi);
 
-		if (sr_config_list(driver, sdi, NULL, SR_CONF_DEVICE_OPTIONS, &gvar) != SR_OK) {
+		if (!(dev_opts = sr_dev_options(driver, sdi, NULL))) {
 			g_critical("Failed to query list device options.");
 			return;
 		}
 
-		dev_opts = g_variant_get_fixed_array(gvar, &n_elements, sizeof(uint32_t));
-
 		is_demo_dev = 0;
-		for (i = 0; i < n_elements; i++) {
-			if (dev_opts[i] == SR_CONF_DEMO_DEV)
+		for (i = 0; i < dev_opts->len; i++) {
+			if (g_array_index(dev_opts, uint32_t, i) == SR_CONF_DEMO_DEV)
 				is_demo_dev = 1;
 		}
 
-		g_variant_unref(gvar);
+		g_array_free(dev_opts, TRUE);
 
 		if (!is_demo_dev)
 			real_devices = g_slist_append(real_devices, sdi);
@@ -609,6 +607,7 @@ void run_session(void)
 		return;
 	}
 
+	trigger = NULL;
 	if (opt_triggers) {
 		if (!parse_triggerstring(sdi, opt_triggers, &trigger)) {
 			sr_session_destroy(session);
@@ -683,8 +682,14 @@ void run_session(void)
 	if (!(t = setup_transform_module(sdi)))
 		g_critical("Failed to initialize transform module.");
 
+	main_loop = g_main_loop_new(NULL, FALSE);
+
+	sr_session_stopped_callback_set(session,
+		(sr_session_stopped_callback)g_main_loop_quit, main_loop);
+
 	if (sr_session_start(session) != SR_OK) {
 		g_critical("Failed to start session.");
+		g_main_loop_unref(main_loop);
 		sr_session_destroy(session);
 		return;
 	}
@@ -692,12 +697,15 @@ void run_session(void)
 	if (opt_continuous)
 		add_anykey(session);
 
-	sr_session_run(session);
+	g_main_loop_run(main_loop);
 
 	if (opt_continuous)
 		clear_anykey();
 
+	if (trigger)
+		sr_trigger_free(trigger);
+
 	sr_session_datafeed_callback_remove_all(session);
+	g_main_loop_unref(main_loop);
 	sr_session_destroy(session);
-
 }