sr_driver_list() now takes a context pointer.

[libsigrok.git] / src / libsigrok-internal.h

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index e6f2dbe264f7d8a42d1fd1178c9ba13e05e6cada..b4b32f23ac2a6df21edd845dabe9dc8a3b2e3efe 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -118,7 +118,7 @@
  * @param p a pointer to the output memory
  * @param x the input unsigned integer
  */
-#define W8(p, x)    do { ((uint8_t*)(p))[0] = (uint8_t) (x);      } while(0)
+#define W8(p, x)    do { ((uint8_t*)(p))[0] = (uint8_t) (x);      } while (0)
 
 /**
  * Write a 16 bits unsigned integer to memory stored as big endian.
@@ -126,7 +126,7 @@
  * @param x the input unsigned integer
  */
 #define WB16(p, x)  do { ((uint8_t*)(p))[1] = (uint8_t) (x);      \
-                         ((uint8_t*)(p))[0] = (uint8_t)((x)>>8);  } while(0)
+                         ((uint8_t*)(p))[0] = (uint8_t)((x)>>8);  } while (0)
 
 /**
  * Write a 16 bits unsigned integer to memory stored as little endian.
@@ -134,7 +134,7 @@
  * @param x the input unsigned integer
  */
 #define WL16(p, x)  do { ((uint8_t*)(p))[0] = (uint8_t) (x);      \
-                         ((uint8_t*)(p))[1] = (uint8_t)((x)>>8);  } while(0)
+                         ((uint8_t*)(p))[1] = (uint8_t)((x)>>8);  } while (0)
 
 /**
  * Write a 32 bits unsigned integer to memory stored as big endian.
@@ -144,7 +144,7 @@
 #define WB32(p, x)  do { ((uint8_t*)(p))[3] = (uint8_t) (x);      \
                          ((uint8_t*)(p))[2] = (uint8_t)((x)>>8);  \
                          ((uint8_t*)(p))[1] = (uint8_t)((x)>>16); \
-                         ((uint8_t*)(p))[0] = (uint8_t)((x)>>24); } while(0)
+                         ((uint8_t*)(p))[0] = (uint8_t)((x)>>24); } while (0)
 
 /**
  * Write a 32 bits unsigned integer to memory stored as little endian.
@@ -154,7 +154,7 @@
 #define WL32(p, x)  do { ((uint8_t*)(p))[0] = (uint8_t) (x);      \
                          ((uint8_t*)(p))[1] = (uint8_t)((x)>>8);  \
                          ((uint8_t*)(p))[2] = (uint8_t)((x)>>16); \
-                         ((uint8_t*)(p))[3] = (uint8_t)((x)>>24); } while(0)
+                         ((uint8_t*)(p))[3] = (uint8_t)((x)>>24); } while (0)
 
 /* Portability fixes for FreeBSD. */
 #ifdef __FreeBSD__
@@ -174,14 +174,15 @@
 #endif
 
 struct sr_context {
+       struct sr_dev_driver **driver_list;
 #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;
+       HANDLE usb_wait_request_event;
+       HANDLE usb_wait_complete_event;
        GPollFD usb_pollfd;
        sr_receive_data_callback usb_cb;
        void *usb_cb_data;
@@ -402,7 +403,7 @@ struct sr_output_module {
        int (*init) (struct sr_output *o, GHashTable *options);
 
        /**
-        * This function is passed a copy of every packed in the data feed.
+        * This function is passed a copy of every packet in the data feed.
         * Any output generated by the output module in response to the
         * packet should be returned in a newly allocated GString
         * <code>out</code>, which will be freed by the caller.
@@ -645,9 +646,11 @@ SR_PRIV void sr_usbtmc_dev_inst_free(struct sr_usbtmc_dev_inst *usbtmc);
 
 /*--- hwdriver.c ------------------------------------------------------------*/
 
+extern SR_PRIV struct sr_dev_driver **drivers_lists[];
+
 SR_PRIV const GVariantType *sr_variant_type_get(int datatype);
 SR_PRIV int sr_variant_type_check(uint32_t key, GVariant *data);
-SR_PRIV void sr_hw_cleanup_all(void);
+SR_PRIV void sr_hw_cleanup_all(const struct sr_context *ctx);
 SR_PRIV struct sr_config *sr_config_new(uint32_t key, GVariant *data);
 SR_PRIV void sr_config_free(struct sr_config *src);
 SR_PRIV int sr_source_remove(int fd);
@@ -663,6 +666,8 @@ SR_PRIV int sr_source_add_channel(GIOChannel *channel, int events, int timeout,
 /*--- session.c -------------------------------------------------------------*/
 
 struct sr_session {
+       /** Context this session exists in. */
+       struct sr_context *ctx;
        /** List of struct sr_dev_inst pointers. */
        GSList *devs;
        /** List of struct sr_dev_inst pointers owned by this session. */
@@ -1072,6 +1077,27 @@ SR_PRIV gboolean sr_ut71x_packet_valid(const uint8_t *buf);
 SR_PRIV int sr_ut71x_parse(const uint8_t *buf, float *floatval,
                struct sr_datafeed_analog *analog, void *info);
 
+/*--- hardware/dmm/vc870.c --------------------------------------------------*/
+
+#define VC870_PACKET_SIZE 23
+
+struct vc870_info {
+       gboolean is_voltage, is_dc, is_ac, is_temperature, is_resistance;
+       gboolean is_continuity, is_capacitance, is_diode, is_loop_current;
+       gboolean is_current, is_micro, is_milli, is_power;
+       gboolean is_power_factor_freq, is_power_apparent_power, is_v_a_eff_value;
+       gboolean is_sign2, is_sign1, is_batt, is_ol1, is_max, is_min;
+       gboolean is_maxmin, is_rel, is_ol2, is_open, is_manu, is_hold;
+       gboolean is_light, is_usb, is_warning, is_auto_power, is_misplug_warn;
+       gboolean is_lo, is_hi, is_open2;
+
+       gboolean is_frequency, is_dual_display, is_auto, is_rms;
+};
+
+SR_PRIV gboolean sr_vc870_packet_valid(const uint8_t *buf);
+SR_PRIV int sr_vc870_parse(const uint8_t *buf, float *floatval,
+               struct sr_datafeed_analog *analog, void *info);
+
 /*--- hardware/lcr/es51919.c ------------------------------------------------*/
 
 SR_PRIV void es51919_serial_clean(void *priv);