X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=sigrokdecode.h;h=14739698f91189935db782a4d5775395d7bddbbe;hp=a6641d40092f5c7ff0865800bff882bcf72e6ea0;hb=f9a3947a7a8d884de6c55693b216f89b1d27d979;hpb=47bd8ddead2ae35b209839255740e3f81ce4b8bc diff --git a/sigrokdecode.h b/sigrokdecode.h index a6641d4..1473969 100644 --- a/sigrokdecode.h +++ b/sigrokdecode.h @@ -67,8 +67,10 @@ enum { SRD_OUTPUT_ANNOTATION, SRD_OUTPUT_PROTOCOL, SRD_OUTPUT_BINARY, - /* When adding an output type, don't forget to expose it to PDs - * in controller.c:PyInit_sigrokdecode() + /* 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() */ }; @@ -150,10 +152,14 @@ struct srd_protocol_data { uint64_t start_sample; uint64_t end_sample; struct srd_pd_output *pdo; - int annotation_type; - unsigned char **data; + int annotation_format; + void *data; }; +struct srd_pd_callback { + int output_type; + void (*callback)(struct srd_protocol_data *); +}; /*--- controller.c ----------------------------------------------------------*/ @@ -169,9 +175,11 @@ 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, +int pd_add(struct srd_decoder_instance *di, int output_type, char *output_id); struct srd_decoder_instance *get_di_by_decobject(void *decobject); +int srd_register_callback(int output_type, void *cb); +void *srd_find_callback(int output_type); /*--- decoder.c -------------------------------------------------------------*/