srd: Cosmetics, fix/add Doxygen comments.

[libsigrokdecode.git] / sigrokdecode.h

diff --git a/sigrokdecode.h b/sigrokdecode.h
index 649cdc63e299ef76077c9e67418562fedbcad907..bebad10551bda713c2a5b7ae8cdd9355416fa1c2 100644 (file)
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -101,16 +101,19 @@ struct srd_decoder {
        /** The decoder ID. Must be non-NULL and unique for all decoders. */
        char *id;
 
-       /** The (short) decoder name. */
+       /** The (short) decoder name. Must be non-NULL. */
        char *name;
 
        /** The (long) decoder name. May be NULL. */
        char *longname;
 
-       /** A (short, one-line) description of the decoder. */
+       /** A (short, one-line) description of the decoder. Must be non-NULL. */
        char *desc;
 
-       /** The license of the decoder. Valid values: "gplv2+", "gplv3+". */
+       /**
+        * The license of the decoder. Valid values: "gplv2+", "gplv3+".
+        * Other values are currently not allowed. Must be non-NULL.
+        */
        char *license;
 
        /** TODO */
@@ -119,29 +122,37 @@ struct srd_decoder {
        /** TODO */
        GSList *outputformats;
 
-       /** Probes */
+       /** List of probes required by this decoder. */
        GSList *probes;
 
-       /** Optional probes */
+       /** List of optional probes for this decoder. */
        GSList *opt_probes;
 
-       /*
+       /**
         * List of NULL-terminated char[], containing descriptions of the
         * supported annotation output.
         */
        GSList *annotations;
 
-       /** Python module */
+       /** Python module. */
        PyObject *py_mod;
 
-       /** sigrokdecode.Decoder class */
+       /** sigrokdecode.Decoder class. */
        PyObject *py_dec;
 };
 
+/**
+ * Structure which contains information about one protocol decoder probe.
+ * For example, I2C has two probes, SDA and SCL.
+ */
 struct srd_probe {
+       /** The ID of the probe. Must be non-NULL. */
        char *id;
+       /** The name of the probe. Must not be NULL. */
        char *name;
+       /** The description of the probe. Must not be NULL. */
        char *desc;
+       /** The index of the probe, i.e. its order in the list of probes. */
        int order;
 };
 
@@ -174,15 +185,16 @@ struct srd_proto_data {
 };
 
 typedef void (*srd_pd_output_callback_t)(struct srd_proto_data *pdata,
-                                        void *user_data);
+                                        void *cb_data);
 
 struct srd_pd_callback {
        int output_type;
-       srd_pd_output_callback_t callback;
-       void *user_data;
+       srd_pd_output_callback_t cb;
+       void *cb_data;
 };
 
-/* custom python types */
+/* Custom Python types: */
+
 typedef struct {
        PyObject_HEAD
 } srd_Decoder;
@@ -202,20 +214,20 @@ typedef struct {
 SRD_API int srd_init(char *path);
 SRD_API int srd_exit(void);
 SRD_API int srd_inst_options_set(struct srd_decoder_inst *di,
-                                    GHashTable *options);
+                                GHashTable *options);
 SRD_API int srd_inst_probes_set(struct srd_decoder_inst *di,
-                                   GHashTable *probes);
+                               GHashTable *probes);
 SRD_API struct srd_decoder_inst *srd_inst_new(const char *id,
-                                                     GHashTable *options);
+                                             GHashTable *options);
 SRD_API int srd_inst_stack(struct srd_decoder_inst *di_from,
-                              struct srd_decoder_inst *di_to);
+                          struct srd_decoder_inst *di_to);
 SRD_API struct srd_decoder_inst *srd_inst_find_by_id(char *inst_id);
 SRD_API int srd_session_start(int num_probes, int unitsize,
                              uint64_t samplerate);
 SRD_API int srd_session_feed(uint64_t start_samplenum, uint8_t *inbuf,
                             uint64_t inbuflen);
 SRD_API int srd_register_callback(int output_type,
-                                 srd_pd_output_callback_t cb, void *user_data);
+                                 srd_pd_output_callback_t cb, void *cb_data);
 
 /*--- decoder.c -------------------------------------------------------------*/
 
@@ -229,13 +241,13 @@ SRD_API char *srd_decoder_doc(struct srd_decoder *dec);
 
 /*--- log.c -----------------------------------------------------------------*/
 
-typedef int (*srd_log_handler_t)(void *user_data, int loglevel,
-                                const char *format, va_list args);
+typedef int (*srd_log_callback_t)(void *cb_data, int loglevel,
+                                 const char *format, va_list args);
 
 SRD_API int srd_log_loglevel_set(int loglevel);
 SRD_API int srd_log_loglevel_get(void);
-SRD_API int srd_log_handler_set(srd_log_handler_t handler, void *user_data);
-SRD_API int srd_log_handler_set_default(void);
+SRD_API int srd_log_callback_set(srd_log_callback_t cb, void *cb_data);
+SRD_API int srd_log_callback_set_default(void);
 SRD_API int srd_log_logdomain_set(const char *logdomain);
 SRD_API char *srd_log_logdomain_get(void);