Use priv for consistency

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 67f3197159bcd12129bdfc1903a4887bb9c0a7be..9036b05f52773315de4dc537d9f39718fafb2644 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -217,6 +217,9 @@ enum {
         */
        SR_UNIT_CONCENTRATION,
        SR_UNIT_REVOLUTIONS_PER_MINUTE,
+       SR_UNIT_VOLT_AMPERE,
+       SR_UNIT_WATT,
+       SR_UNIT_WATT_HOUR,
 };
 
 /** Values for sr_datafeed_analog.flags. */
@@ -546,6 +549,13 @@ struct sr_probe {
        char *trigger;
 };
 
+struct sr_probe_group {
+       /* List of sr_probe structs. */
+       GSList *probes;
+       /* Private data for driver use. */
+       void *priv;
+};
+
 struct sr_config {
        int key;
        GVariant *data;
@@ -583,6 +593,9 @@ enum {
        /** The device can measure humidity. */
        SR_CONF_HYGROMETER,
 
+       /** The device can measure energy consumption. */
+       SR_CONF_ENERGYMETER,
+
        /*--- Driver scan options -------------------------------------------*/
 
        /**
@@ -771,6 +784,8 @@ struct sr_dev_inst {
        char *model;
        char *version;
        GSList *probes;
+       /* List of sr_probe_group structs */
+       GSList *probe_groups;
        void *conn;
        void *priv;
 };
@@ -808,11 +823,14 @@ struct sr_dev_driver {
        GSList *(*dev_list) (void);
        int (*dev_clear) (void);
        int (*config_get) (int id, GVariant **data,
-                       const struct sr_dev_inst *sdi);
+                       const struct sr_dev_inst *sdi,
+                       const struct sr_probe_group *probe_group);
        int (*config_set) (int id, GVariant *data,
-                       const struct sr_dev_inst *sdi);
+                       const struct sr_dev_inst *sdi,
+                       const struct sr_probe_group *probe_group);
        int (*config_list) (int info_id, GVariant **data,
-                       const struct sr_dev_inst *sdi);
+                       const struct sr_dev_inst *sdi,
+                       const struct sr_probe_group *probe_group);
 
        /* Device-specific */
        int (*dev_open) (struct sr_dev_inst *sdi);