refactored PD framework, now using new sigrok.Decoder object

[libsigrokdecode.git] / sigrokdecode.h

diff --git a/sigrokdecode.h b/sigrokdecode.h
index b856f4f79bee73d5954d9393ae2438a4baed9ef9..c1ef9ffbb0ebd27baab250b3400e858830bb3da3 100644 (file)
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -88,24 +88,41 @@ struct srd_decoder {
        /** TODO */
        GSList *outputformats;
 
+       /** TODO */
+       PyObject *py_mod;
+
        /** Python object that performs the decoding */
        PyObject *py_decobj;
 };
 
 struct srd_decoder_instance {
+       struct srd_decoder *decoder;
        PyObject *py_instance;
+       GSList *pd_output;
 };
 
 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_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);
+int srd_instance_start(struct srd_decoder_instance *di,
+                       const char *driver, int unitsize, uint64_t starttime);
+int srd_run_decoder(struct srd_decoder_instance *dec,
+                   uint8_t *inbuf, uint64_t inbuflen);
+
+/* 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, PyObject *py_mod, const char *key, char **outstr);
+
 
 #ifdef __cplusplus
 }