X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=sigrokdecode.h;h=8266fb50d20ea57ded0dd276022f3ed682797dcb;hp=f7d93accd39c564a1edb52186ec1156f2032d2f8;hb=81fc8c6bdea80ea4abf6ed636f88bf5e93b26420;hpb=43c0a640533331c45ed1b46725524773085de99e

diff --git a/sigrokdecode.h b/sigrokdecode.h
index f7d93ac..8266fb5 100644
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -49,7 +49,7 @@ extern "C" {
 #define SRD_OK			 0 /**< No error */
 #define SRD_ERR			-1 /**< Generic/unspecified error */
 #define SRD_ERR_MALLOC		-2 /**< Malloc/calloc/realloc error */
-#define SRD_ERR_ARGS		-3 /**< Function argument error */
+#define SRD_ERR_ARG		-3 /**< Function argument error */
 #define SRD_ERR_PYTHON		-4 /**< Python C API error */
 #define SRD_ERR_DECODERS_DIR	-5 /**< Protocol decoder path invalid */
 
@@ -61,6 +61,12 @@ extern "C" {
 #define SRD_LOG_DBG	4 /**< Output debug messages. */
 #define SRD_LOG_SPEW	5 /**< Output very noisy debug messages. */
 
+enum {
+	SRD_OUTPUT_LOGIC = 1,
+	SRD_OUTPUT_ANNOTATION,
+	SRD_OUTPUT_PROTOCOL,
+};
+
 /* TODO: Documentation. */
 struct srd_decoder {
 	/** The decoder ID. Must be non-NULL and unique for all decoders. */
@@ -109,6 +115,13 @@ struct srd_decoder_instance {
 	GSList *pd_output;
 };
 
+struct srd_pd_output {
+	int pdo_id;
+	int output_type;
+	char *protocol_id;
+	char *description;
+};
+
 /*--- controller.c ----------------------------------------------------------*/
 
 int srd_init(void);
@@ -121,7 +134,12 @@ int srd_instance_start(struct srd_decoder_instance *di,
 			const char *driver, int unitsize, uint64_t starttime);
 int srd_session_start(const char *driver, int unitsize, uint64_t starttime,
 		uint64_t samplerate);
-int srd_session_feed(uint8_t *inbuf, uint64_t inbuflen);
+int srd_run_decoder(uint64_t timeoffset, uint64_t duration,
+		struct srd_decoder_instance *dec, uint8_t *inbuf, uint64_t inbuflen);
+int srd_session_feed(uint64_t timeoffset, uint64_t duration, uint8_t *inbuf,
+		uint64_t inbuflen);
+int pd_output_new(struct srd_decoder_instance *di, int output_type,
+		char *output_id, char *description);
 
 /*--- decoder.c -------------------------------------------------------------*/
 
@@ -133,8 +151,7 @@ int srd_load_all_decoders(void);
 int srd_unload_all_decoders(void);
 
 /*--- util.c ----------------------------------------------------------------*/
-
-int h_str(PyObject *py_res, PyObject *py_mod, const char *key, char **outstr);
+int h_str(PyObject *py_res, const char *key, char **outstr);
 
 /*--- log.c -----------------------------------------------------------------*/