Change PD options to be a tuple of dictionaries.

[libsigrokdecode.git] / libsigrokdecode.h

diff --git a/libsigrokdecode.h b/libsigrokdecode.h
index 3175fd8b94a1f35d0b50d89dc9919b813ec6cd86..f07e1ee32da91542e506ec2b9ef3c81e234e4161 100644 (file)
--- a/libsigrokdecode.h
+++ b/libsigrokdecode.h
@@ -168,6 +168,12 @@ struct srd_decoder {
         */
        GSList *annotations;
 
+       /**
+        * List of annotation rows (row items: id, description, and a list
+        * of annotation classes belonging to this row).
+        */
+       GSList *annotation_rows;
+
        /**
         * List of NULL-terminated char[], containing descriptions of the
         * supported binary output.
@@ -203,6 +209,13 @@ struct srd_decoder_option {
        char *id;
        char *desc;
        GVariant *def;
+    GSList *values;
+};
+
+struct srd_decoder_annotation_row {
+       char *id;
+       char *desc;
+       GSList *ann_classes;
 };
 
 struct srd_decoder_inst {
@@ -300,7 +313,7 @@ SRD_API int srd_decoder_unload_all(void);
 SRD_API int srd_inst_option_set(struct srd_decoder_inst *di,
                GHashTable *options);
 SRD_API int srd_inst_probe_set_all(struct srd_decoder_inst *di,
-               GHashTable *probes);
+               GHashTable *probes, int unit_size);
 SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
                const char *id, GHashTable *options);
 SRD_API int srd_inst_stack(struct srd_session *sess,