don't accept numbers as probe identifiers in trigger string

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 53905b6f8127a5965066270c4448e0268b707b36..595f19171194db950a745465c2e2d4cb7f1f1f8b 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -146,6 +146,8 @@ enum {
        SR_MQ_FREQUENCY,
        SR_MQ_DUTY_CYCLE,
        SR_MQ_CONTINUITY,
+       SR_MQ_PULSE_WIDTH,
+       SR_MQ_CONDUCTANCE,
 };
 
 /* sr_datafeed_analog.unit values */
@@ -160,6 +162,8 @@ enum {
        SR_UNIT_HERTZ,
        SR_UNIT_PERCENTAGE,
        SR_UNIT_BOOLEAN,
+       SR_UNIT_SECOND,
+       SR_UNIT_SIEMENS,
 };
 
 /** sr_datafeed_analog.flags values */
@@ -252,6 +256,9 @@ struct sr_output_format {
                     uint64_t *length_out);
        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);
+       int (*cleanup) (struct sr_output *o);
 };
 
 struct sr_datastore {
@@ -530,6 +537,11 @@ struct sr_dev_driver {
        void *priv;
 };
 
+/* Private driver context. */
+struct drv_context {
+       GSList *instances;
+};
+
 struct sr_session {
        /* List of struct sr_dev* */
        GSList *devs;