Fix utf8 encoding error by changing the Python parameter to a bytes() object (python3...

[libsigrokdecode.git] / sigrokdecode.h

diff --git a/sigrokdecode.h b/sigrokdecode.h
index b7ed2dc8e0376caf59008c1f81e9d176a0327e78..8266fb50d20ea57ded0dd276022f3ed682797dcb 100644 (file)
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -49,10 +49,24 @@ 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 */
 
+/* libsigrokdecode loglevels. */
+#define SRD_LOG_NONE   0 /**< Output no messages at all. */
+#define SRD_LOG_ERR    1 /**< Output error messages. */
+#define SRD_LOG_WARN   2 /**< Output warnings. */
+#define SRD_LOG_INFO   3 /**< Output informational messages. */
+#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. */
@@ -96,19 +110,53 @@ struct srd_decoder {
 };
 
 struct srd_decoder_instance {
+       struct srd_decoder *decoder;
        PyObject *py_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);
-GSList *srd_list_decoders(void);
-struct srd_decoder *srd_get_decoder_by_id(const char *id);
+int srd_exit(void);
+int set_modulepath(void);
 struct srd_decoder_instance *srd_instance_new(const char *id);
 int srd_instance_set_probe(struct srd_decoder_instance *di,
                                const char *probename, int num);
+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_exit(void);
+               uint64_t samplerate);
+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 -------------------------------------------------------------*/
+
+GSList *srd_list_decoders(void);
+struct srd_decoder *srd_get_decoder_by_id(const char *id);
+int srd_load_decoder(const char *name, struct srd_decoder **dec);
+int srd_unload_decoder(struct srd_decoder *dec);
+int srd_load_all_decoders(void);
+int srd_unload_all_decoders(void);
+
+/*--- util.c ----------------------------------------------------------------*/
+int h_str(PyObject *py_res, const char *key, char **outstr);
+
+/*--- log.c -----------------------------------------------------------------*/
+
+int srd_set_loglevel(int loglevel);
+int srd_get_loglevel(void);
 
 #ifdef __cplusplus
 }