X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=sigrokdecode-internal.h;h=5e455919841f2fef6fde923370642cec43ab824e;hp=a16154e55f703fb988e496ef5704376f9dd1a474;hb=d37961b0c723abba3d70c9ef1a94f78bf4245f7d;hpb=12243c22bf01506ac3b220bfe38384db9903756c

diff --git a/sigrokdecode-internal.h b/sigrokdecode-internal.h
index a16154e..5e45591 100644
--- a/sigrokdecode-internal.h
+++ b/sigrokdecode-internal.h
@@ -24,31 +24,25 @@
 
 #include "sigrokdecode.h"
 
-/*--- Macros ----------------------------------------------------------------*/
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#endif
-
-#ifndef ARRAY_AND_SIZE
-#define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a)
-#endif
-
 /*--- controller.c ----------------------------------------------------------*/
 
-SRD_PRIV int add_modulepath(const char *path);
+SRD_PRIV int srd_decoder_searchpath_add(const char *path);
 SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di, PyObject *args);
 SRD_PRIV int srd_inst_decode(uint64_t start_samplenum,
-				struct srd_decoder_inst *dec,
-				uint8_t *inbuf, uint64_t inbuflen);
+			     const struct srd_decoder_inst *dec,
+			     const uint8_t *inbuf, uint64_t inbuflen);
 SRD_PRIV void srd_inst_free(struct srd_decoder_inst *di);
 SRD_PRIV void srd_inst_free_all(GSList *stack);
-SRD_PRIV int pd_add(struct srd_decoder_inst *di, int output_type,
-		    char *output_id);
+SRD_PRIV int srd_inst_pd_output_add(struct srd_decoder_inst *di,
+				    int output_type, const char *output_id);
+
+/*--- decoder.c -------------------------------------------------------------*/
+
+SRD_PRIV void *srd_pd_output_callback_find(int output_type);
 
 /*--- exception.c -----------------------------------------------------------*/
 
-SRD_PRIV void catch_exception(const char *format, ...);
+SRD_PRIV void srd_exception_catch(const char *format, ...);
 
 /*--- log.c -----------------------------------------------------------------*/
 
@@ -61,11 +55,13 @@ SRD_PRIV int srd_err(const char *format, ...);
 
 /*--- util.c ----------------------------------------------------------------*/
 
-SRD_PRIV int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr);
-SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr);
-SRD_PRIV int py_str_as_str(PyObject *py_str, char **outstr);
-SRD_PRIV int py_strlist_to_char(PyObject *py_strlist, char ***outstr);
-SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack,
-							      PyObject *obj);
+SRD_PRIV int py_attr_as_str(const PyObject *py_obj, const char *attr,
+			    char **outstr);
+SRD_PRIV int py_dictitem_as_str(const PyObject *py_obj, const char *key,
+				char **outstr);
+SRD_PRIV int py_str_as_str(const PyObject *py_str, char **outstr);
+SRD_PRIV int py_strlist_to_char(const PyObject *py_strlist, char ***outstr);
+SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(const GSList *stack,
+						       const PyObject *obj);
 
 #endif