X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Flibsigrok%2Flibsigrok.h;h=0abf412f940194cd374316650afb1cb80533828f;hb=a1f7c854c502cca8fe7e5576b9a01ad1086f9170;hp=356739cc05a8f9bcb15df1923c8e82b0475dcc90;hpb=dff0a894356803e238c9ad49c147fbe9aa81c568;p=libsigrok.git

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 356739cc..0abf412f 100644
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -149,6 +149,7 @@ enum sr_datatype {
 	SR_T_UINT64_RANGE,
 	SR_T_DOUBLE_RANGE,
 	SR_T_INT32,
+	SR_T_MQLIST,
 };
 
 /** Value for sr_datafeed_packet.type. */
@@ -518,6 +519,12 @@ struct sr_option {
 	GSList *values;
 };
 
+/** Output module flags. */
+enum sr_output_flag {
+	/** If set, this output module writes the output itself. */
+	SR_OUTPUT_INTERNAL_IO_HANDLING = 0x01,
+};
+
 struct sr_input;
 struct sr_input_module;
 struct sr_output;
@@ -568,15 +575,21 @@ struct sr_config {
 	GVariant *data;
 };
 
-/** Information about a config key. */
-struct sr_config_info {
-	/** Config key like SR_CONF_CONN, etc. */
+enum sr_keytype {
+	SR_KEY_CONFIG,
+	SR_KEY_MQ,
+	SR_KEY_MQFLAGS,
+};
+
+/** Information about a key. */
+struct sr_key_info {
+	/** Config key like SR_CONF_CONN, MQ value like SR_MQ_VOLTAGE, etc. */
 	uint32_t key;
-	/** Data type like SR_T_STRING, etc. */
+	/** Data type like SR_T_STRING, etc if applicable. */
 	int datatype;
-	/** Id string, e.g. "serialcomm". */
+	/** Short, lowercase ID string, e.g. "serialcomm", "voltage". */
 	char *id;
-	/** Name, e.g. "Serial communication". */
+	/** Full capitalized name, e.g. "Serial communication". */
 	char *name;
 	/** Verbose description (unused currently). */
 	char *description;
@@ -1093,8 +1106,8 @@ struct sr_serial_port {
 	char *description;
 };
 
-#include "proto.h"
-#include "version.h"
+#include <libsigrok/proto.h>
+#include <libsigrok/version.h>
 
 #ifdef __cplusplus
 }