X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Flibsigrok%2Flibsigrok.h;h=5309efbdbb55fd34c426a6ab5e14f8df030e9e3c;hb=c7b17bcba3751c7849229089cce8773bb4355be7;hp=69d88d19d7b8505bbc660dbdb904b68e4b8daf19;hpb=edb691fcedb767093885c61d19d8d490c9c8c9c2;p=libsigrok.git

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 69d88d19..5309efbd 100644
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -162,7 +162,7 @@ enum sr_packettype {
 	SR_DF_TRIGGER,
 	/** Payload is struct sr_datafeed_logic. */
 	SR_DF_LOGIC,
-	/** Payload is struct sr_datafeed_analog_old. */
+	/** DEPRECATED! Use SR_DF_ANALOG instead. */
 	SR_DF_ANALOG_OLD,
 	/** Beginning of frame. No payload. */
 	SR_DF_FRAME_BEGIN,
@@ -546,11 +546,11 @@ struct sr_analog_spec {
 /** Generic option struct used by various subsystems. */
 struct sr_option {
 	/* Short name suitable for commandline usage, [a-z0-9-]. */
-	char *id;
+	const char *id;
 	/* Short name suitable for GUI usage, can contain UTF-8. */
-	char *name;
+	const char *name;
 	/* Description of the option, in a sentence. */
-	char *desc;
+	const char *desc;
 	/* Default value for this option. */
 	GVariant *def;
 	/* List of possible values, if this is an option with few values. */
@@ -645,11 +645,11 @@ struct sr_key_info {
 	/** Data type like SR_T_STRING, etc if applicable. */
 	int datatype;
 	/** Short, lowercase ID string, e.g. "serialcomm", "voltage". */
-	char *id;
+	const char *id;
 	/** Full capitalized name, e.g. "Serial communication". */
-	char *name;
+	const char *name;
 	/** Verbose description (unused currently). */
-	char *description;
+	const char *description;
 };
 
 #define SR_CONF_GET  (1 << 31)
@@ -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. */