X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok.h;h=f371c944fd6ff85ac6b699ec1cba06f40f272836;hb=def5c35c4c4a4f62ffc8800a1e2d7154e8fc4bd3;hp=73a3afc6e0987962338bc00f0bea9768056cd925;hpb=24d04d1e3de61cc3f1f12c3091bf393ee2dac8de;p=libsigrok.git

diff --git a/libsigrok.h b/libsigrok.h
index 73a3afc6..f371c944 100644
--- 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. */
@@ -260,7 +268,7 @@ struct sr_context;
 
 struct sr_datafeed_packet {
 	uint16_t type;
-	void *payload;
+	const void *payload;
 };
 
 struct sr_datafeed_header {
@@ -328,7 +336,7 @@ struct sr_output_format {
 	int (*event) (struct sr_output *o, int event_type, uint8_t **data_out,
 		      uint64_t *length_out);
 	GString *(*recv) (struct sr_output *o, const struct sr_dev_inst *sdi,
-			struct sr_datafeed_packet *packet);
+			const struct sr_datafeed_packet *packet);
 	int (*cleanup) (struct sr_output *o);
 };
 
@@ -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. */
@@ -547,6 +561,8 @@ enum {
 	SR_ST_INACTIVE,
 	/** The device instance is actively in use in a session. */
 	SR_ST_ACTIVE,
+	/** The device is winding down its session. */
+	SR_ST_STOPPING,
 };
 
 /*
@@ -603,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);
@@ -618,7 +634,7 @@ struct sr_dev_driver {
 			const void *value);
 	int (*dev_acquisition_start) (const struct sr_dev_inst *sdi,
 			void *cb_data);
-	int (*dev_acquisition_stop) (const struct sr_dev_inst *sdi,
+	int (*dev_acquisition_stop) (struct sr_dev_inst *sdi,
 			void *cb_data);
 
 	/* Dynamic */