hardware/agilent-dmm/Makefile.am: Fix typo.

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 4810f8c15ac7e109d068dfae039ffab9b6a44deb..9946691e267503cd6fab4abfbf681da39d83b334 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -176,6 +176,8 @@ enum {
        /** Logarithmic representation of sound pressure relative to a
         * reference value. */
        SR_MQ_SOUND_PRESSURE_LEVEL,
+       SR_MQ_CARBON_MONOXIDE,
+       SR_MQ_RELATIVE_HUMIDITY,
 };
 
 /** Values for sr_datafeed_analog.unit. */
@@ -208,6 +210,12 @@ enum {
        SR_UNIT_UNITLESS,
        /** Sound pressure level relative so 20 micropascals. */
        SR_UNIT_DECIBEL_SPL,
+       /**
+        * Normalized (0 to 1) concentration of a substance or compound with 0
+        * representing a concentration of 0%, and 1 being 100%. This is
+        * represented as the fraction of number of particles of the substance.
+        */
+       SR_UNIT_CONCENTRATION,
 };
 
 /** Values for sr_datafeed_analog.flags. */
@@ -231,13 +239,13 @@ enum {
        /** Device is in relative mode. */
        SR_MQFLAG_RELATIVE = 0x100,
        /** Sound pressure level is A-weighted in the frequency domain,
-        * according to IRC 61672:2003. */
+        * according to IEC 61672:2003. */
        SR_MQFLAG_SPL_FREQ_WEIGHT_A = 0x200,
        /** Sound pressure level is C-weighted in the frequency domain,
-        * according to IRC 61672:2003. */
+        * according to IEC 61672:2003. */
        SR_MQFLAG_SPL_FREQ_WEIGHT_C = 0x400,
        /** Sound pressure level is Z-weighted (i.e. not at all) in the
-        * frequency domain, according to IRC 61672:2003. */
+        * frequency domain, according to IEC 61672:2003. */
        SR_MQFLAG_SPL_FREQ_WEIGHT_Z = 0x800,
        /** Sound pressure level is not weighted in the frequency domain,
         * albeit without standards-defined low and high frequency limits. */
@@ -426,6 +434,12 @@ enum {
        /** The device can act as a sound level meter. */
        SR_HWCAP_SOUNDLEVELMETER,
 
+       /** The device can measure temperature. */
+       SR_HWCAP_THERMOMETER,
+
+       /** The device can measure humidity. */
+       SR_HWCAP_HYGROMETER,
+
        /*--- Device configuration ------------------------------------------*/
 
        /** The device supports setting/changing its samplerate. */
@@ -605,7 +619,7 @@ struct sr_dev_driver {
        char *name;
        char *longname;
        int api_version;
-       int (*init) (void);
+       int (*init) (struct sr_context *sr_ctx);
        int (*cleanup) (void);
        GSList *(*scan) (GSList *options);
        GSList *(*dev_list) (void);