X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=sigrokdecode.h;h=cf52264493052b5600aaa16719f28dfac13f3a44;hp=14739698f91189935db782a4d5775395d7bddbbe;hb=6b741b128c9838d2c417e56a6e8b5d377467a3ff;hpb=f9a3947a7a8d884de6c55693b216f89b1d27d979 diff --git a/sigrokdecode.h b/sigrokdecode.h index 1473969..cf52264 100644 --- a/sigrokdecode.h +++ b/sigrokdecode.h @@ -96,9 +96,6 @@ struct srd_decoder { /** The author of the decoder. May be NULL. */ char *author; - /** An email address of the decoder's author. May be NULL. */ - char *email; - /** The license of the decoder. Valid values: "gplv2+", "gplv3+". */ char *license; @@ -126,10 +123,12 @@ struct srd_decoder { 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; + GSList *next_di; }; struct srd_pd_output { @@ -167,12 +166,17 @@ struct srd_pd_callback { int srd_init(void); int srd_exit(void); int set_modulepath(void); -struct srd_decoder_instance *srd_instance_new(const char *id); +struct srd_decoder_instance *srd_instance_new(const char *id, + const char *instance_id); +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); -int srd_session_start(int num_probes, int unitsize, uint64_t samplerate); -int srd_run_decoder(uint64_t timeoffset, uint64_t duration, +struct srd_decoder_instance *srd_instance_find(char *instance_id); +int srd_instance_start(struct srd_decoder_instance *di, PyObject *args); +int srd_instance_decode(uint64_t timeoffset, uint64_t duration, struct srd_decoder_instance *dec, uint8_t *inbuf, uint64_t inbuflen); +int srd_session_start(int num_probes, int unitsize, uint64_t samplerate); int srd_session_feed(uint64_t timeoffset, uint64_t duration, uint8_t *inbuf, uint64_t inbuflen); int pd_add(struct srd_decoder_instance *di, int output_type,