added Nexus-Computing OsciPrime VID:PID

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 90a57f790baaa264c3355e8ed1f102f0f205474f..f371c944fd6ff85ac6b699ec1cba06f40f272836 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. */
@@ -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);
 };
 
@@ -631,8 +639,6 @@ struct sr_dev_driver {
 
        /* Dynamic */
        void *priv;
-
-       int subdriver;
 };
 
 struct sr_session {