X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=sigrokdecode.h;h=815fd74e14e6579afee5b1bca72027b92a069cd0;hp=1d8a79b78a760a1627368729090b9574d3e9ea88;hb=decde15ecb51b3326b31019af61e0a729b9c61d0;hpb=86528298fa2abfe825d6763b806095972e8bd8f4

diff --git a/sigrokdecode.h b/sigrokdecode.h
index 1d8a79b..815fd74 100644
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -67,10 +67,10 @@ enum {
 	SRD_OUTPUT_ANN,
 	SRD_OUTPUT_PROTO,
 	SRD_OUTPUT_BINARY,
-	/* When adding an output type, don't forget to expose it to PDs in:
-	 *     controller.c:PyInit_sigrokdecode()
-	 * and add a check in:
-	 *     module_sigrokdecode.c:Decoder_put()
+	/* When adding an output type, don't forget to...
+	 * 	  - expose it to PDs in controller.c:PyInit_sigrokdecode()
+	 * 	  - add a check in module_sigrokdecode.c:Decoder_put()
+	 *    - add a debug string in type_decoder.c:OUTPUT_TYPES
 	 */
 };
 
@@ -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,21 +117,30 @@ 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;
 };
 
 struct srd_pd_output {
 	int pdo_id;
 	int output_type;
-	struct srd_decoder *decoder;
+	struct srd_decoder_instance *di;
 	char *proto_id;
 };
 
@@ -163,13 +178,17 @@ typedef struct {
 int srd_init(void);
 int srd_exit(void);
 int set_modulepath(void);
+int srd_instance_set_options(struct srd_decoder_instance *di,
+		GHashTable *options);
+int srd_instance_set_probes(struct srd_decoder_instance *di,
+		GHashTable *probes);
 struct srd_decoder_instance *srd_instance_new(const char *id,
-		const char *instance_id);
+		GHashTable *options);
 int srd_instance_stack(struct srd_decoder_instance *di_from,
 		struct srd_decoder_instance *di_to);
-int srd_instance_set_probe(struct srd_decoder_instance *di,
-				const char *probename, int num);
-struct srd_decoder_instance *srd_instance_find(char *instance_id);
+struct srd_decoder_instance *srd_instance_find_by_id(char *instance_id);
+struct srd_decoder_instance *srd_instance_find_by_obj(GSList *stack,
+		PyObject *obj);
 int srd_instance_start(struct srd_decoder_instance *di, PyObject *args);
 int srd_instance_decode(uint64_t start_samplenum,
 		struct srd_decoder_instance *dec, uint8_t *inbuf, uint64_t inbuflen);
@@ -189,14 +208,22 @@ int srd_load_all_decoders(void);
 int srd_unload_all_decoders(void);
 char *srd_decoder_doc(struct srd_decoder *dec);
 
+/*--- exception.c -----------------------------------------------------------*/
+void catch_exception(const char *format, ...);
+
 /*--- 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);
 
 /*--- log.c -----------------------------------------------------------------*/
+typedef int (*srd_log_handler_t)(void *data, int loglevel, const char *format,
+				 va_list args);
 int srd_set_loglevel(int loglevel);
 int srd_get_loglevel(void);
+int srd_log_set_handler(srd_log_handler_t handler, void *data);
+int srd_log_set_default_handler(void);
 
 #ifdef __cplusplus
 }