From: Bert Vermeulen Date: Sun, 12 Feb 2012 12:47:07 +0000 (+0100) Subject: srd: no public API functions use python-specific arguments now X-Git-Tag: libsigrokdecode-0.1.0~50 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=ee4ed2279e3d3d4b2911aa2a1ed4effcbd1bbe60 srd: no public API functions use python-specific arguments now --- diff --git a/controller.c b/controller.c index 8b9f793..0701674 100644 --- a/controller.c +++ b/controller.c @@ -526,7 +526,7 @@ SRD_API struct srd_decoder_inst *srd_inst_find_by_id(char *inst_id) * * @return Pointer to struct srd_decoder_inst, or NULL if not found. */ -SRD_API struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack, +SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack, PyObject *obj) { GSList *l; @@ -544,7 +544,7 @@ SRD_API struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack, return di; } -SRD_API int srd_inst_start(struct srd_decoder_inst *di, PyObject *args) +SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di, PyObject *args) { PyObject *py_name, *py_res; GSList *l; diff --git a/sigrokdecode-internal.h b/sigrokdecode-internal.h index 60914c3..56d3691 100644 --- a/sigrokdecode-internal.h +++ b/sigrokdecode-internal.h @@ -22,8 +22,6 @@ #define LIBSIGROKDECODE_SIGROKDECODE_INTERNAL_H #include "sigrokdecode.h" -// #include -// #include /*--- Macros ----------------------------------------------------------------*/ @@ -59,5 +57,7 @@ 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); #endif diff --git a/sigrokdecode.h b/sigrokdecode.h index ae4ec81..0558a4f 100644 --- a/sigrokdecode.h +++ b/sigrokdecode.h @@ -211,9 +211,7 @@ SRD_API struct srd_decoder_inst *srd_inst_new(const char *id, SRD_API int srd_inst_stack(struct srd_decoder_inst *di_from, struct srd_decoder_inst *di_to); SRD_API struct srd_decoder_inst *srd_inst_find_by_id(char *inst_id); -SRD_API struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack, - PyObject *obj); -SRD_API int srd_inst_start(struct srd_decoder_inst *di, PyObject *args); +SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di, PyObject *args); SRD_API int srd_inst_decode(uint64_t start_samplenum, struct srd_decoder_inst *dec, uint8_t *inbuf, uint64_t inbuflen);