diff options
| -rw-r--r-- | sigrokdecode-internal.h | 16 | ||||
| -rw-r--r-- | sigrokdecode.h | 13 |
2 files changed, 16 insertions, 13 deletions
diff --git a/sigrokdecode-internal.h b/sigrokdecode-internal.h index 86a77e4..6443f96 100644 --- a/sigrokdecode-internal.h +++ b/sigrokdecode-internal.h @@ -35,6 +35,15 @@ #define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a) #endif +/*--- controller.c ----------------------------------------------------------*/ + +SRD_PRIV int pd_add(struct srd_decoder_instance *di, int output_type, + char *output_id); + +/*--- exception.c -----------------------------------------------------------*/ + +SRD_PRIV void catch_exception(const char *format, ...); + /*--- log.c -----------------------------------------------------------------*/ SRD_PRIV int srd_log(int loglevel, const char *format, ...); @@ -44,4 +53,11 @@ SRD_PRIV int srd_info(const char *format, ...); SRD_PRIV int srd_warn(const char *format, ...); 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); + #endif diff --git a/sigrokdecode.h b/sigrokdecode.h index 69fc2ce..de08ff6 100644 --- a/sigrokdecode.h +++ b/sigrokdecode.h @@ -219,8 +219,6 @@ 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_PRIV int pd_add(struct srd_decoder_instance *di, int output_type, - char *output_id); SRD_API struct srd_decoder_instance *get_di_by_decobject(void *decobject); typedef void (*srd_pd_output_callback_t)(struct srd_proto_data *pdata); SRD_API int srd_register_callback(int output_type, srd_pd_output_callback_t cb); @@ -236,17 +234,6 @@ SRD_API int srd_load_all_decoders(void); SRD_API int srd_unload_all_decoders(void); SRD_API char *srd_decoder_doc(struct srd_decoder *dec); -/*--- exception.c -----------------------------------------------------------*/ - -SRD_PRIV void catch_exception(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); - /*--- log.c -----------------------------------------------------------------*/ typedef int (*srd_log_handler_t)(void *data, int loglevel, const char *format, |