X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libsigrok.h;h=90a57f790baaa264c3355e8ed1f102f0f205474f;hb=06b7a8af7e2e4b7baf28f4fa710a7dd00765f18a;hp=4810f8c15ac7e109d068dfae039ffab9b6a44deb;hpb=69b07d14db24055d23bbb4c4cc718ec073ece0b7;p=libsigrok.git

diff --git a/libsigrok.h b/libsigrok.h
index 4810f8c1..90a57f79 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -231,13 +231,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 +426,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 +611,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);
@@ -625,6 +631,8 @@ struct sr_dev_driver {
 
 	/* Dynamic */
 	void *priv;
+
+	int subdriver;
 };
 
 struct sr_session {