X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Flibsigrok%2Flibsigrok.h;h=511ab28c0f074ce25afb5fe121ed038dda9298e6;hb=9ea62f2e0ac1ae9ee01215148177ae4e6f344078;hp=de3136b94dbfb77fca4167cb52c4893e678a8f94;hpb=c57aa1ac19b437281e60c394483a15aec9080916;p=libsigrok.git

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index de3136b9..511ab28c 100644
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -162,8 +162,6 @@ enum sr_packettype {
 	SR_DF_TRIGGER,
 	/** Payload is struct sr_datafeed_logic. */
 	SR_DF_LOGIC,
-	/** DEPRECATED! Use SR_DF_ANALOG instead. */
-	SR_DF_ANALOG_OLD,
 	/** Beginning of frame. No payload. */
 	SR_DF_FRAME_BEGIN,
 	/** End of frame. No payload. */
@@ -383,6 +381,8 @@ enum sr_mqflag {
 	SR_MQFLAG_REFERENCE = 0x80000,
 	/** Unstable value (hasn't settled yet). */
 	SR_MQFLAG_UNSTABLE = 0x100000,
+	/** Measurement is four wire (e.g. Kelvin connection). */
+	SR_MQFLAG_FOUR_WIRE = 0x200000,
 
 	/*
 	 * Update mq_strings[] (analog.c) and fancyprint() (output/analog.c)
@@ -494,24 +494,6 @@ struct sr_datafeed_logic {
 	void *data;
 };
 
-/** Analog datafeed payload for type SR_DF_ANALOG_OLD. */
-struct sr_datafeed_analog_old {
-	/** The channels for which data is included in this packet. */
-	GSList *channels;
-	/** Number of samples in data */
-	int num_samples;
-	/** Measured quantity (voltage, current, temperature, and so on).
-	 *  Use SR_MQ_VOLTAGE, ... */
-	int mq;
-	/** Unit in which the MQ is measured. Use SR_UNIT_VOLT, ... */
-	int unit;
-	/** Bitmap with extra information about the MQ. Use SR_MQFLAG_AC, ... */
-	uint64_t mqflags;
-	/** The analog value(s). The data is interleaved according to
-	 * the channels list. */
-	float *data;
-};
-
 /** Analog datafeed payload for type SR_DF_ANALOG. */
 struct sr_datafeed_analog {
 	void *data;
@@ -662,8 +644,6 @@ enum sr_configcap {
 	SR_CONF_LIST = (1 << 29),
 };
 
-#define SR_CONF_MASK 0x1fffffff
-
 /** Configuration keys */
 enum sr_configkey {
 	/*--- Device classes ------------------------------------------------*/
@@ -978,18 +958,21 @@ enum sr_configkey {
 	/** Over-temperature protection (OTP) active. */
 	SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE,
 
-	/* Update sr_key_info_config[] (hwdriver.c) upon changes! */
+	/** Under-voltage condition. */
+	SR_CONF_UNDER_VOLTAGE_CONDITION,
 
-	/*--- Special stuff -------------------------------------------------*/
+	/** Under-voltage condition active. */
+	SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE,
 
-	/** Scan options supported by the driver. */
-	SR_CONF_SCAN_OPTIONS = 40000,
+	/** Trigger level. */
+	SR_CONF_TRIGGER_LEVEL,
 
-	/** Device options for a particular device. */
-	SR_CONF_DEVICE_OPTIONS,
+	/* Update sr_key_info_config[] (hwdriver.c) upon changes! */
+
+	/*--- Special stuff -------------------------------------------------*/
 
 	/** Session filename. */
-	SR_CONF_SESSIONFILE,
+	SR_CONF_SESSIONFILE = 40000,
 
 	/** The device supports specifying a capturefile to inject. */
 	SR_CONF_CAPTUREFILE,
@@ -1017,6 +1000,9 @@ enum sr_configkey {
 	/** The device supports setting a probe factor. */
 	SR_CONF_PROBE_FACTOR,
 
+	/** Number of powerline cycles for ADC integration time. */
+	SR_CONF_ADC_POWERLINE_CYCLES,
+
 	/* Update sr_key_info_config[] (hwdriver.c) upon changes! */
 
 	/*--- Acquisition modes, sample limiting ----------------------------*/
@@ -1153,11 +1139,9 @@ struct sr_dev_driver {
 	/** Close device */
 	int (*dev_close) (struct sr_dev_inst *sdi);
 	/** Begin data acquisition on the specified device. */
-	int (*dev_acquisition_start) (const struct sr_dev_inst *sdi,
-			void *cb_data);
+	int (*dev_acquisition_start) (const struct sr_dev_inst *sdi);
 	/** End data acquisition on the specified device. */
-	int (*dev_acquisition_stop) (struct sr_dev_inst *sdi,
-			void *cb_data);
+	int (*dev_acquisition_stop) (struct sr_dev_inst *sdi);
 
 	/* Dynamic */
 	/** Device driver context, considered private. Initialized by init(). */