sr: backend/zeroplus: Improve debug output.

[libsigrok.git] / sigrok.h.in

diff --git a/sigrok.h.in b/sigrok.h.in
index 7da26b2f25ae31551b38ae7eeddad676c9696305..3e6f24e8f00a15337b73c8f183e36bd5cbb16ccf 100644 (file)
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -143,7 +143,8 @@ enum {
        SR_T_CHAR,
        SR_T_BOOL,
        SR_T_FLOAT,
-       SR_T_RATIONAL,
+       SR_T_RATIONAL_PERIOD,
+       SR_T_RATIONAL_VOLT,
 };
 
 struct sr_rational {
@@ -166,6 +167,11 @@ enum {
        SR_DF_FRAME_END,
 };
 
+/* sr_datafeed_analog.unit values */
+enum {
+       SR_UNIT_VOLTAGE,
+};
+
 struct sr_datafeed_packet {
        uint16_t type;
        void *payload;
@@ -193,6 +199,7 @@ struct sr_datafeed_meta_analog {
 
 struct sr_datafeed_analog {
        int num_samples;
+       int unit;
        float *data;
 };
 
@@ -319,6 +326,12 @@ enum {
        /** Filter. */
        SR_HWCAP_FILTER,
 
+       /** Volts/div. */
+       SR_HWCAP_VDIV,
+
+       /** Coupling. */
+       SR_HWCAP_COUPLING,
+
        /*--- Special stuff -------------------------------------------------*/
 
        /* TODO: Better description. */
@@ -427,6 +440,10 @@ enum {
        SR_DI_TRIGGER_SOURCES,
        /* Supported filter targets */
        SR_DI_FILTERS,
+       /* Valid volts/div values */
+       SR_DI_VDIVS,
+       /* Coupling options */
+       SR_DI_COUPLING,
 };
 
 /*
@@ -438,7 +455,7 @@ struct sr_samplerates {
        uint64_t low;
        uint64_t high;
        uint64_t step;
-       uint64_t *list;
+       const uint64_t *list;
 };
 
 struct sr_dev_driver {
@@ -452,10 +469,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);
 };