sr: analog: Add MQ and UNIT enums.

[libsigrok.git] / sigrok.h.in

diff --git a/sigrok.h.in b/sigrok.h.in
index 38d7d474ebcf2b4a011bcbe12a6fea940a0e5f6c..1d1f8caf8add72445a43a9232c9b970915d8738c 100644 (file)
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -167,6 +167,29 @@ enum {
        SR_DF_FRAME_END,
 };
 
+/* sr_datafeed_analog.mq values */
+enum {
+       SR_MQ_VOLTAGE,
+       SR_MQ_CURRENT,
+       SR_MQ_RESISTANCE,
+       SR_MQ_CAPACITANCE,
+       SR_MQ_TEMPERATURE,
+       SR_MQ_FREQUENCY,
+       SR_MQ_DUTY_CYCLE,
+};
+
+/* sr_datafeed_analog.unit values */
+enum {
+       SR_UNIT_VOLT,
+       SR_UNIT_AMPERE,
+       SR_UNIT_OHM,
+       SR_UNIT_FARAD,
+       SR_UNIT_CELSIUS,
+       SR_UNIT_KELVIN,
+       SR_UNIT_HERTZ,
+       SR_UNIT_PERCENTAGE,
+};
+
 struct sr_datafeed_packet {
        uint16_t type;
        void *payload;
@@ -194,6 +217,8 @@ struct sr_datafeed_meta_analog {
 
 struct sr_datafeed_analog {
        int num_samples;
+       int mq; /* Measured quantity (e.g. voltage, current, temperature) */
+       int unit; /* Unit in which the MQ is measured. */
        float *data;
 };
 
@@ -323,6 +348,9 @@ enum {
        /** Volts/div. */
        SR_HWCAP_VDIV,
 
+       /** Coupling. */
+       SR_HWCAP_COUPLING,
+
        /*--- Special stuff -------------------------------------------------*/
 
        /* TODO: Better description. */
@@ -433,6 +461,8 @@ enum {
        SR_DI_FILTERS,
        /* Valid volts/div values */
        SR_DI_VDIVS,
+       /* Coupling options */
+       SR_DI_COUPLING,
 };
 
 /*
@@ -444,7 +474,7 @@ struct sr_samplerates {
        uint64_t low;
        uint64_t high;
        uint64_t step;
-       uint64_t *list;
+       const uint64_t *list;
 };
 
 struct sr_dev_driver {
@@ -458,10 +488,10 @@ struct sr_dev_driver {
        /* Device-specific */
        int (*dev_open) (int dev_index);
        int (*dev_close) (int dev_index);
-       void *(*dev_info_get) (int dev_index, int dev_info_id);
+       const void *(*dev_info_get) (int dev_index, int dev_info_id);
        int (*dev_status_get) (int dev_index);
-       int *(*hwcap_get_all) (void);
-       int (*dev_config_set) (int dev_index, int hwcap, void *value);
+       const int *(*hwcap_get_all) (void);
+       int (*dev_config_set) (int dev_index, int hwcap, const void *value);
        int (*dev_acquisition_start) (int dev_index, void *session_dev_id);
        int (*dev_acquisition_stop) (int dev_index, void *session_dev_id);
 };