srd: SPI: Set default PD options.

[libsigrokdecode.git] / sigrokdecode.h

diff --git a/sigrokdecode.h b/sigrokdecode.h
index 14739698f91189935db782a4d5775395d7bddbbe..3c693145c28b2363134393dd2edda5d73e4034b8 100644 (file)
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -64,8 +64,8 @@ extern "C" {
 #define SRD_LOG_SPEW   5 /**< Output very noisy debug messages. */
 
 enum {
-       SRD_OUTPUT_ANNOTATION,
-       SRD_OUTPUT_PROTOCOL,
+       SRD_OUTPUT_ANN,
+       SRD_OUTPUT_PROTO,
        SRD_OUTPUT_BINARY,
        /* When adding an output type, don't forget to expose it to PDs in:
         *     controller.c:PyInit_sigrokdecode()
@@ -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;
 
@@ -114,7 +111,7 @@ struct srd_decoder {
        /* List of NULL-terminated char[], containing descriptions of the
         * supported annotation output.
         */
-       GSList *annotation;
+       GSList *annotations;
 
        /** TODO */
        PyObject *py_mod;
@@ -126,17 +123,19 @@ 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 {
        int pdo_id;
        int output_type;
        struct srd_decoder *decoder;
-       char *protocol_id;
+       char *proto_id;
 };
 
 typedef struct {
@@ -148,17 +147,17 @@ typedef struct {
        PyObject *sample;
 } srd_logic;
 
-struct srd_protocol_data {
+struct srd_proto_data {
        uint64_t start_sample;
        uint64_t end_sample;
        struct srd_pd_output *pdo;
-       int annotation_format;
+       int ann_format;
        void *data;
 };
 
 struct srd_pd_callback {
        int output_type;
-       void (*callback)(struct srd_protocol_data *);
+       void (*callback)(struct srd_proto_data *);
 };
 
 
@@ -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,