define correct variable for the unified Rigol driver

[libsigrok.git] / libsigrok-internal.h

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index d1fb313297bd7281fd7b5abfc5ab2484fa290944..358d555951281a7ea00304f8fafd7f3521ec873d 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -27,7 +27,7 @@
 #include <libusb.h>
 #endif
 #ifdef HAVE_LIBSERIALPORT
-#include <serialport.h>
+#include <libserialport.h>
 #endif
 
 /**
@@ -75,10 +75,16 @@ struct sr_serial_dev_inst {
        char *port;
        char *serialcomm;
        int fd;
+       int nonblocking;
        struct sp_port *data;
 };
 #endif
 
+struct sr_usbtmc_dev_inst {
+       char *device;
+       int fd;
+};
+
 /* Private driver context. */
 struct drv_context {
        struct sr_context *sr_ctx;
@@ -119,6 +125,9 @@ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port,
 SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial);
 #endif
 
+/* USBTMC-specific instances */
+SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device);
+SR_PRIV void sr_usbtmc_dev_inst_free(struct sr_usbtmc_dev_inst *usbtmc);
 
 /*--- hwdriver.c ------------------------------------------------------------*/
 
@@ -131,6 +140,35 @@ SR_PRIV int sr_source_add(int fd, int events, int timeout,
 
 /*--- session.c -------------------------------------------------------------*/
 
+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;
+};
+
 SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
                const struct sr_datafeed_packet *packet);
 SR_PRIV int sr_session_stop_sync(void);