X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok.h;h=bdc07230bd45d8f19a290fd05c670288318433e8;hb=f5cfe894eca22fc40dac721566a727cae8d8454c;hp=e7b988c4a60afc3fe5e35ed37c9c13e0390a5ac6;hpb=87ca93c5043899e3c30edb7e09fadef3ee67d810;p=libsigrok.git

diff --git a/libsigrok.h b/libsigrok.h
index e7b988c4..bdc07230 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -145,6 +145,7 @@ enum {
 	SR_MQ_TEMPERATURE,
 	SR_MQ_FREQUENCY,
 	SR_MQ_DUTY_CYCLE,
+	SR_MQ_CONTINUITY,
 };
 
 /* sr_datafeed_analog.unit values */
@@ -153,10 +154,34 @@ enum {
 	SR_UNIT_AMPERE,
 	SR_UNIT_OHM,
 	SR_UNIT_FARAD,
-	SR_UNIT_CELSIUS,
 	SR_UNIT_KELVIN,
+	SR_UNIT_CELSIUS,
+	SR_UNIT_FAHRENHEIT,
 	SR_UNIT_HERTZ,
 	SR_UNIT_PERCENTAGE,
+	SR_UNIT_BOOLEAN,
+};
+
+/** sr_datafeed_analog.flags values */
+enum {
+	/** Voltage measurement is alternating current. */
+	SR_MQFLAG_AC = 0x01,
+	/** Voltage measurement is direct current. */
+	SR_MQFLAG_DC = 0x02,
+	/** This is a true RMS measurement. */
+	SR_MQFLAG_RMS = 0x04,
+	/** Value is voltage drop across a diode, or NAN. */
+	SR_MQFLAG_DIODE = 0x08,
+	/** Device is in "hold" mode, i.e. repeating the last measurement. */
+	SR_MQFLAG_HOLD = 0x10,
+	/** Device is in "max" mode, only updating when a new max value is found. */
+	SR_MQFLAG_MAX = 0x20,
+	/** Device is in "min" mode, only updating when a new min value is found. */
+	SR_MQFLAG_MIN = 0x40,
+	/** Device is in autoranging mode. */
+	SR_MQFLAG_AUTORANGE = 0x80,
+	/** Device is in relative mode. */
+	SR_MQFLAG_RELATIVE = 0x100,
 };
 
 struct sr_datafeed_packet {
@@ -186,8 +211,12 @@ 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. */
+	/** Measured quantity (e.g. voltage, current, temperature) */
+	int mq;
+	/** Unit in which the MQ is measured. */
+	int unit;
+	/** Bitmap with extra information about the MQ. */
+	uint64_t mqflags;
 	float *data;
 };
 
@@ -223,6 +252,9 @@ struct sr_output_format {
 		     uint64_t *length_out);
 	int (*event) (struct sr_output *o, int event_type, uint8_t **data_out,
 		      uint64_t *length_out);
+	GString *(*recv) (struct sr_output *o, const struct sr_dev_inst *sdi,
+			struct sr_datafeed_packet *packet);
+	int (*cleanup) (struct sr_output *o);
 };
 
 struct sr_datastore {
@@ -305,10 +337,6 @@ enum {
 	/** The device supports setting/changing its samplerate. */
 	SR_HWCAP_SAMPLERATE,
 
-	/* TODO: Better description? Rename to PROBE_AND_TRIGGER_CONFIG? */
-	/** The device supports setting a probe mask. */
-	SR_HWCAP_PROBECONFIG,
-
 	/** The device supports setting a pre/post-trigger capture ratio. */
 	SR_HWCAP_CAPTURE_RATIO,
 
@@ -436,9 +464,6 @@ enum {
 
 /* Device info IDs */
 enum {
-	/* struct sr_dev_inst for this specific device */
-	/* TODO: obsolete */
-	SR_DI_INST,
 	/* A list of options supported by the driver. */
 	SR_DI_HWOPTS,
 	/* A list of capabilities supported by the device. */
@@ -489,6 +514,8 @@ struct sr_dev_driver {
 	int (*init) (void);
 	int (*cleanup) (void);
 	GSList *(*scan) (GSList *options);
+	GSList *(*dev_list) (void);
+	int (*dev_clear) (void);
 
 	/* Device-specific */
 	int (*dev_open) (struct sr_dev_inst *sdi);
@@ -503,7 +530,7 @@ struct sr_dev_driver {
 			void *cb_data);
 
 	/* Dynamic */
-	GSList *instances;
+	void *priv;
 };
 
 struct sr_session {
@@ -512,7 +539,6 @@ struct sr_session {
 	/* list of sr_receive_data_callback_t */
 	GSList *datafeed_callbacks;
 	GTimeVal starttime;
-	gboolean running;
 
 	unsigned int num_sources;