X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=sigrokdecode.h;h=70652a4f8cdcbf444c6316e5508a99d6b48a9112;hp=2649d868018623920a341fe41da0f871d57cf18a;hb=f38ec2855ce41154bc1035dd7f1ab9a21f411f0d;hpb=11ea8ae1b2279566125978766735a26252dff412

diff --git a/sigrokdecode.h b/sigrokdecode.h
index 2649d86..70652a4 100644
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -99,6 +99,12 @@ struct srd_decoder {
 	/** TODO */
 	GSList *outputformats;
 
+	/** Probes */
+	GSList *probes;
+
+	/** Optional probes */
+	GSList *extra_probes;
+
 	/* List of NULL-terminated char[], containing descriptions of the
 	 * supported annotation output.
 	 */
@@ -111,14 +117,23 @@ struct srd_decoder {
 	PyObject *py_dec;
 };
 
+struct srd_probe {
+	char *id;
+	char *name;
+	char *desc;
+	int order;
+};
+
 struct srd_decoder_instance {
 	struct srd_decoder *decoder;
 	PyObject *py_instance;
 	char *instance_id;
 	GSList *pd_output;
-	int num_probes;
-	int unitsize;
-	uint64_t samplerate;
+	int dec_num_probes;
+	int *dec_probemap;
+	int data_num_probes;
+	int data_unitsize;
+	uint64_t data_samplerate;
 	GSList *next_di;
 };
 
@@ -193,6 +208,7 @@ char *srd_decoder_doc(struct srd_decoder *dec);
 
 /*--- util.c ----------------------------------------------------------------*/
 int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr);
+int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr);
 int py_str_as_str(PyObject *py_str, char **outstr);
 int py_strlist_to_char(PyObject *py_strlist, char ***outstr);