X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok.h.in;h=1d1f8caf8add72445a43a9232c9b970915d8738c;hb=17dff8a1e6faaec02ed99715f2914b15b4cab82e;hp=759565dfb4a9f14ef2515a2f265fea79fa3e2e73;hpb=b7f578bef53ff0e645ca0cae3f9781f577b7367a;p=libsigrok.git

diff --git a/sigrok.h.in b/sigrok.h.in
index 759565df..1d1f8caf 100644
--- 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;
 };
 
@@ -449,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 {
@@ -466,7 +491,7 @@ struct sr_dev_driver {
 	const void *(*dev_info_get) (int dev_index, int dev_info_id);
 	int (*dev_status_get) (int dev_index);
 	const int *(*hwcap_get_all) (void);
-	int (*dev_config_set) (int dev_index, int hwcap, void *value);
+	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);
 };