demo: Code cleanup.

[libsigrok.git] / libsigrok-internal.h

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index d19f3670426279f4a9bee3ce890345e8be5cf6ea..c76f5983b7bddccf1d9388d0334ad0822c7fea5d 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -21,8 +21,8 @@
   * @internal
   */
 
-#ifndef LIBSIGROK_SIGROK_INTERNAL_H
-#define LIBSIGROK_SIGROK_INTERNAL_H
+#ifndef LIBSIGROK_LIBSIGROK_INTERNAL_H
+#define LIBSIGROK_LIBSIGROK_INTERNAL_H
 
 #include <stdarg.h>
 #include <glib.h>
@@ -60,15 +60,28 @@
 struct sr_context {
 #ifdef HAVE_LIBUSB_1_0
        libusb_context *libusb_ctx;
+       gboolean usb_source_present;
+#ifdef _WIN32
+       GThread *usb_thread;
+       gboolean usb_thread_running;
+       GMutex usb_mutex;
+       HANDLE usb_event;
+       GPollFD usb_pollfd;
+       sr_receive_data_callback_t usb_cb;
+       void *usb_cb_data;
+#endif
 #endif
 };
 
 #ifdef HAVE_LIBUSB_1_0
 /** USB device instance */
 struct sr_usb_dev_inst {
-       uint8_t bus;       /**< USB bus */
-       uint8_t address;   /**< Device address on USB bus */
-       struct libusb_device_handle *devhdl;  /**< libusb device handle */
+       /** USB bus */
+       uint8_t bus;
+       /** Device address on USB bus */
+       uint8_t address;
+       /** libusb device handle */
+       struct libusb_device_handle *devhdl;
 };
 #endif
 
@@ -77,10 +90,18 @@ struct sr_usb_dev_inst {
 #define SERIAL_PARITY_EVEN SP_PARITY_EVEN
 #define SERIAL_PARITY_ODD  SP_PARITY_ODD
 struct sr_serial_dev_inst {
-       char *port;             /**< Port name, e.g. '/dev/tty42'. */
-       char *serialcomm;       /**< Comm params for serial_set_paramstr(). */
+       /** Port name, e.g. '/dev/tty42'. */
+       char *port;
+       /** Comm params for serial_set_paramstr(). */
+       char *serialcomm;
+       /** Port is non-blocking. */
        int nonblocking;
-       struct sp_port *data;   /**< libserialport port handle */
+       /** libserialport port handle */
+       struct sp_port *data;
+       /** libserialport event set */
+       struct sp_event_set *event_set;
+       /** GPollFDs for event polling */
+       GPollFD *pollfds;
 };
 #endif
 
@@ -91,7 +112,8 @@ struct sr_usbtmc_dev_inst {
 
 /* Private driver context. */
 struct drv_context {
-       struct sr_context *sr_ctx;  /**< sigrok context */
+       /** sigrok context */
+       struct sr_context *sr_ctx;
        GSList *instances;
 };
 
@@ -169,9 +191,10 @@ struct sr_session {
         * an async fashion. We need to make sure the session is stopped from
         * within the session thread itself.
         */
-       GMutex stop_mutex;  /**< Mutex protecting access to abort_session. */
+       /** Mutex protecting access to abort_session. */
+       GMutex stop_mutex;
+       /** Abort current session. See sr_session_stop(). */
        gboolean abort_session;
-                       /**< Abort current session. See sr_session_stop(). */
 };
 
 SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
@@ -255,6 +278,9 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
 #ifdef HAVE_LIBUSB_1_0
 SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn);
 SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb);
+SR_PRIV int usb_source_add(struct sr_context *ctx, int timeout,
+               sr_receive_data_callback_t cb, void *cb_data);
+SR_PRIV int usb_source_remove(struct sr_context *ctx);
 #endif
 
 /*--- hardware/common/scpi.c ------------------------------------------------*/
@@ -451,6 +477,14 @@ SR_PRIV void sr_fs9721_01_temp_c(struct sr_datafeed_analog *analog, void *info);
 SR_PRIV void sr_fs9721_10_temp_c(struct sr_datafeed_analog *analog, void *info);
 SR_PRIV void sr_fs9721_01_10_temp_f_c(struct sr_datafeed_analog *analog, void *info);
 
+/*--- hardware/common/dmm/m2110.c -----------------------------------------*/
+
+#define BBCGM_M2110_PACKET_SIZE 9
+
+SR_PRIV gboolean sr_m2110_packet_valid(const uint8_t *buf);
+SR_PRIV int sr_m2110_parse(const uint8_t *buf, float *floatval,
+                            struct sr_datafeed_analog *analog, void *info);
+
 /*--- hardware/common/dmm/metex14.c -----------------------------------------*/
 
 #define METEX14_PACKET_SIZE 14