X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrokdecode.h;h=3ce6ae5ee37b798c53c583d7b30cec1a645a2b7a;hb=234cbf50152b7e007322c62ed6190ae6bff30a92;hp=b9cc921287e876347ceea9d1ea08f61a46046f2e;hpb=49f2cdc76dd405dfb674da1284349a28f75c2ebd;p=libsigrokdecode.git diff --git a/libsigrokdecode.h b/libsigrokdecode.h index b9cc921..3ce6ae5 100644 --- a/libsigrokdecode.h +++ b/libsigrokdecode.h @@ -121,14 +121,15 @@ enum srd_loglevel { /* * When adding an output type, don't forget to... - * - expose it to PDs in controller.c:PyInit_sigrokdecode() - * - add a check in module_sigrokdecode.c:Decoder_put() - * - add a debug string in type_decoder.c:OUTPUT_TYPES + * - expose it to PDs in module_sigrokdecode.c:PyInit_sigrokdecode() + * - add a check in type_decoder.c:Decoder_put() + * - add a debug string in type_decoder.c:output_type_name() */ enum srd_output_type { SRD_OUTPUT_ANN, SRD_OUTPUT_PYTHON, SRD_OUTPUT_BINARY, + SRD_OUTPUT_LOGIC, SRD_OUTPUT_META, }; @@ -188,6 +189,11 @@ struct srd_decoder { */ GSList *binary; + /** + * List of logic output channels (item: id, description). + */ + GSList *logic_output_channels; + /** List of decoder options. */ GSList *options; @@ -232,6 +238,11 @@ struct srd_decoder_annotation_row { GSList *ann_classes; }; +struct srd_decoder_logic_output_channel { + char *id; + char *desc; +}; + struct srd_decoder_inst { struct srd_decoder *decoder; struct srd_session *sess; @@ -312,7 +323,12 @@ struct srd_proto_data_annotation { struct srd_proto_data_binary { int bin_class; /* Index into "struct srd_decoder"->binary. */ uint64_t size; - const unsigned char *data; + const uint8_t *data; +}; +struct srd_proto_data_logic { + int logic_group; + uint64_t repeat_count; /* Number of times the value in data was repeated. */ + const uint8_t *data; /* Bitfield containing the states of the logic outputs */ }; typedef void (*srd_pd_output_callback)(struct srd_proto_data *pdata,