X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok.h;h=4212c59c4f046d77522b81a12b9a949568664123;hb=e45ad6e24ff1a3873d551f9ed08acb3ffd0d1d0d;hp=6f6163b6e2c0a2b99cb2a5c1123d4d0b7967142e;hpb=13d8e03c4f9fb6fe9c5f682ab957173effe42d43;p=libsigrok.git

diff --git a/libsigrok.h b/libsigrok.h
index 6f6163b6..4212c59c 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -522,7 +522,7 @@ struct sr_probe {
 
 struct sr_config {
 	int key;
-	const void *value;
+	GVariant *data;
 };
 
 struct sr_config_info {
@@ -636,6 +636,12 @@ enum {
 	/** The device supports setting its sample interval, in ms. */
 	SR_CONF_SAMPLE_INTERVAL,
 
+	/** Number of timebases, as related to SR_CONF_TIMEBASE.  */
+	SR_CONF_NUM_TIMEBASE,
+
+	/** Number of vertical divisions, as related to SR_CONF_VDIV.  */
+	SR_CONF_NUM_VDIV,
+
 	/*--- Special stuff -------------------------------------------------*/
 
 	/** Scan options supported by the driver. */
@@ -722,18 +728,6 @@ enum {
 	SR_ST_STOPPING,
 };
 
-/*
- * A device supports either a range of samplerates with steps of a given
- * granularity, or is limited to a set of defined samplerates. Use either
- * step or list, but not both.
- */
-struct sr_samplerates {
-	uint64_t low;
-	uint64_t high;
-	uint64_t step;
-	const uint64_t *list;
-};
-
 struct sr_dev_driver {
 	/* Driver-specific */
 	char *name;
@@ -744,11 +738,11 @@ struct sr_dev_driver {
 	GSList *(*scan) (GSList *options);
 	GSList *(*dev_list) (void);
 	int (*dev_clear) (void);
-	int (*config_get) (int id, const void **value,
+	int (*config_get) (int id, GVariant **data,
 			const struct sr_dev_inst *sdi);
-	int (*config_set) (int id, const void *value,
+	int (*config_set) (int id, GVariant *data,
 			const struct sr_dev_inst *sdi);
-	int (*config_list) (int info_id, const void **data,
+	int (*config_list) (int info_id, GVariant **data,
 			const struct sr_dev_inst *sdi);
 
 	/* Device-specific */
@@ -781,6 +775,14 @@ struct sr_session {
 	struct source *sources;
 	GPollFD *pollfds;
 	int source_timeout;
+
+	/*
+	 * These are our synchronization primitives for stopping the session in
+	 * an async fashion. We need to make sure the session is stopped from
+	 * within the session thread itself.
+	 */
+	GMutex stop_mutex;
+	gboolean abort_session;
 };
 
 #include "proto.h"