X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Flibsigrok%2Flibsigrok.h;h=1030f258fed69ccc066ad6d9dd0695f38435b74e;hb=e5ef649be3167dbb9f6403e2c1d0e2e1b09d3a0c;hp=6c67f570906da0f24680a504619f4e84651de8d7;hpb=bee246665b05a59f91ff7d51040cbaee614ab0c7;p=libsigrok.git

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 6c67f570..1030f258 100644
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -162,19 +162,19 @@ enum sr_packettype {
 	SR_DF_TRIGGER,
 	/** Payload is struct sr_datafeed_logic. */
 	SR_DF_LOGIC,
-	/** Payload is struct sr_datafeed_analog. */
-	SR_DF_ANALOG,
+	/** DEPRECATED! Use SR_DF_ANALOG instead. */
+	SR_DF_ANALOG_OLD,
 	/** Beginning of frame. No payload. */
 	SR_DF_FRAME_BEGIN,
 	/** End of frame. No payload. */
 	SR_DF_FRAME_END,
-	/** Payload is struct sr_datafeed_analog2. */
-	SR_DF_ANALOG2,
+	/** Payload is struct sr_datafeed_analog. */
+	SR_DF_ANALOG,
 
 	/* Update datafeed_dump() (session.c) upon changes! */
 };
 
-/** Measured quantity, sr_datafeed_analog.mq. */
+/** Measured quantity, sr_analog_meaning.mq. */
 enum sr_mq {
 	SR_MQ_VOLTAGE = 10000,
 	SR_MQ_CURRENT,
@@ -237,7 +237,7 @@ enum sr_mq {
 	/* Update sr_key_info_mq[] (hwdriver.c) upon changes! */
 };
 
-/** Unit of measured quantity, sr_datafeed_analog.unit. */
+/** Unit of measured quantity, sr_analog_meaning.unit. */
 enum sr_unit {
 	/** Volt */
 	SR_UNIT_VOLT = 10000,
@@ -331,7 +331,7 @@ enum sr_unit {
 	 */
 };
 
-/** Values for sr_datafeed_analog.flags. */
+/** Values for sr_analog_meaning.mqflags. */
 enum sr_mqflag {
 	/** Voltage measurement is alternating current (AC). */
 	SR_MQFLAG_AC = 0x01,
@@ -494,8 +494,8 @@ struct sr_datafeed_logic {
 	void *data;
 };
 
-/** Analog datafeed payload for type SR_DF_ANALOG. */
-struct sr_datafeed_analog {
+/** 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 */
@@ -512,8 +512,8 @@ struct sr_datafeed_analog {
 	float *data;
 };
 
-/** Analog datafeed payload for type SR_DF_ANALOG2. */
-struct sr_datafeed_analog2 {
+/** Analog datafeed payload for type SR_DF_ANALOG. */
+struct sr_datafeed_analog {
 	void *data;
 	uint32_t num_samples;
 	struct sr_analog_encoding *encoding;
@@ -1091,9 +1091,9 @@ enum sr_dev_inst_status {
 struct sr_dev_driver {
 	/* Driver-specific */
 	/** Driver name. Lowercase a-z, 0-9 and dashes (-) only. */
-	char *name;
+	const char *name;
 	/** Long name. Verbose driver name shown to user. */
-	char *longname;
+	const char *longname;
 	/** API version (currently 1).	*/
 	int api_version;
 	/** Called when driver is loaded, e.g. program startup. */
@@ -1157,14 +1157,6 @@ struct sr_dev_driver {
 	void *context;
 };
 
-/**
- * @struct sr_session
- *
- * Opaque data structure representing a libsigrok session. None of the fields
- * of this structure are meant to be accessed directly.
- */
-struct sr_session;
-
 /** Serial port descriptor. */
 struct sr_serial_port {
 	/** The OS dependent name of the serial port. */