Fix a bunch of typos.

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

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 14320a753c32db0c404b6ee1709aa28117c5012e..f3f6a0269f1b63c02a0db48f39223a32a7a52781 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__
@@ -402,7 +402,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.
@@ -589,8 +589,8 @@ enum {
        SR_CHANNEL_SET_ENABLED = 1 << 0,
 };
 
-SR_PRIV struct sr_channel *sr_channel_new(int index, int type,
-               gboolean enabled, const char *name);
+SR_PRIV struct sr_channel *sr_channel_new(struct sr_dev_inst *sdi,
+               int index, int type, gboolean enabled, const char *name);
 
 /** Device instance data */
 struct sr_dev_inst {
@@ -669,6 +669,7 @@ struct sr_session {
        GSList *owned_devs;
        /** List of struct datafeed_callback pointers. */
        GSList *datafeed_callbacks;
+       GSList *transforms;
        struct sr_trigger *trigger;
        GTimeVal starttime;
        gboolean running;
@@ -1071,6 +1072,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);
@@ -1091,4 +1113,16 @@ SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi,
 SR_PRIV int es51919_serial_acquisition_stop(struct sr_dev_inst *sdi,
                                            void *cb_data);
 
+/*--- hardware/dmm/ut372.c --------------------------------------------------*/
+
+#define UT372_PACKET_SIZE 27
+
+struct ut372_info {
+       int dummy;
+};
+
+SR_PRIV gboolean sr_ut372_packet_valid(const uint8_t *buf);
+SR_PRIV int sr_ut372_parse(const uint8_t *buf, float *floatval,
+               struct sr_datafeed_analog *analog, void *info);
+
 #endif