srd: More consistent log related function names.

[libsigrokdecode.git] / sigrokdecode.h

diff --git a/sigrokdecode.h b/sigrokdecode.h
index 2c9cb40128f7b19eb787b73c37f49e286b0f477f..a7ea910bb5aa7c28ae972bbdc8d137496d4ada25 100644 (file)
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef SIGROKDECODE_SIGROKDECODE_H
-#define SIGROKDECODE_SIGROKDECODE_H
+#ifndef LIBSIGROKDECODE_SIGROKDECODE_H
+#define LIBSIGROKDECODE_SIGROKDECODE_H
 
 #include <Python.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include <stdint.h>
@@ -103,7 +103,7 @@ struct srd_decoder {
        GSList *probes;
 
        /** Optional probes */
-       GSList *extra_probes;
+       GSList *opt_probes;
 
        /* List of NULL-terminated char[], containing descriptions of the
         * supported annotation output.
@@ -192,11 +192,14 @@ struct srd_decoder_instance *srd_instance_find_by_obj(GSList *stack,
 int srd_instance_start(struct srd_decoder_instance *di, PyObject *args);
 int srd_instance_decode(uint64_t start_samplenum,
                struct srd_decoder_instance *dec, uint8_t *inbuf, uint64_t inbuflen);
+void srd_instance_free(struct srd_decoder_instance *di);
+void srd_instance_free_all(GSList *stack);
 int srd_session_start(int num_probes, int unitsize, uint64_t samplerate);
 int srd_session_feed(uint64_t start_samplenum, uint8_t *inbuf, uint64_t inbuflen);
 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);
+typedef void (*srd_pd_output_callback_t)(struct srd_proto_data *pdata);
+int srd_register_callback(int output_type, srd_pd_output_callback_t cb);
 void *srd_find_callback(int output_type);
 
 /*--- decoder.c -------------------------------------------------------------*/
@@ -220,12 +223,12 @@ int py_strlist_to_char(PyObject *py_strlist, char ***outstr);
 /*--- log.c -----------------------------------------------------------------*/
 typedef int (*srd_log_handler_t)(void *data, int loglevel, const char *format,
                                 va_list args);
-int srd_set_loglevel(int loglevel);
-int srd_get_loglevel(void);
-int srd_log_set_handler(srd_log_handler_t handler, void *data);
-int srd_log_set_default_handler(void);
-int srd_log_set_logdomain(const char *logdomain);
-char *srd_log_get_logdomain(void);
+int srd_log_loglevel_set(int loglevel);
+int srd_log_loglevel_get(void);
+int srd_log_handler_set(srd_log_handler_t handler, void *data);
+int srd_log_handler_set_default(void);
+int srd_log_logdomain_set(const char *logdomain);
+char *srd_log_logdomain_get(void);
 
 #ifdef __cplusplus
 }