X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok.h;h=53ff8c2470431c9e83619e5d256573e2b435bbe0;hb=31034792da84daa5163b7d72bb98664c65aa7cc0;hp=910e52453f5ae6565d00bc9cf0ae2b0fdec67a4d;hpb=367983a7443d12d85243215bdc83f6cbdd82daeb;p=libsigrok.git

diff --git a/libsigrok.h b/libsigrok.h
index 910e5245..53ff8c24 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -803,6 +803,10 @@ enum {
 	SR_INST_USB = 10000,
 	/** Device instance type for serial port devices. */
 	SR_INST_SERIAL,
+	/** Device instance type for USBTMC devices. */
+	SR_INST_USBTMC,
+	/** Device instance type for SCPI devices. */
+	SR_INST_SCPI,
 };
 
 /** Device instance status. */
@@ -851,34 +855,11 @@ struct sr_dev_driver {
 	void *priv;
 };
 
-struct sr_session {
-	/** List of struct sr_dev pointers. */
-	GSList *devs;
-	/** List of struct datafeed_callback pointers. */
-	GSList *datafeed_callbacks;
-	GTimeVal starttime;
-	gboolean running;
-
-	unsigned int num_sources;
-
-	/*
-	 * Both "sources" and "pollfds" are of the same size and contain pairs
-	 * of descriptor and callback function. We can not embed the GPollFD
-	 * into the source struct since we want to be able to pass the array
-	 * of all poll descriptors to g_poll().
-	 */
-	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;
-};
+/**
+ * Opaque data structure representing a libsigrok session. None of the fields
+ * of this structure are meant to be accessed directly.
+ */
+struct sr_session;
 
 #include "proto.h"
 #include "version.h"