X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=libsigrokdecode-internal.h;h=1d0931e0715df2bac1fdf3ada2a2b8fd6e064c0a;hp=26093884111b40b70e7d7c23ed685ff149142ad3;hb=2842721f189c5338d268a6e70002936289ae6069;hpb=3262ef0203e23399f3cab796391da06969c8306b diff --git a/libsigrokdecode-internal.h b/libsigrokdecode-internal.h index 2609388..1d0931e 100644 --- a/libsigrokdecode-internal.h +++ b/libsigrokdecode-internal.h @@ -49,7 +49,7 @@ struct srd_term { typedef struct { PyObject_HEAD struct srd_decoder_inst *di; - uint64_t start_samplenum; + uint64_t abs_start_samplenum; unsigned int itercnt; uint8_t *inbuf; uint64_t inbuflen; @@ -70,20 +70,18 @@ struct srd_session { SRD_PRIV int srd_decoder_searchpath_add(const char *path); /* session.c */ -SRD_PRIV int session_is_valid(struct srd_session *sess); SRD_PRIV struct srd_pd_callback *srd_pd_output_callback_find(struct srd_session *sess, int output_type); /* instance.c */ -SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj( const GSList *stack, - const PyObject *obj); SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di); SRD_PRIV void match_array_free(struct srd_decoder_inst *di); SRD_PRIV void condition_list_free(struct srd_decoder_inst *di); SRD_PRIV int srd_inst_decode(struct srd_decoder_inst *di, - uint64_t start_samplenum, uint64_t end_samplenum, + uint64_t abs_start_samplenum, uint64_t abs_end_samplenum, const uint8_t *inbuf, uint64_t inbuflen, uint64_t unitsize); SRD_PRIV int process_samples_until_condition_match(struct srd_decoder_inst *di, gboolean *found_match); +SRD_PRIV int srd_inst_terminate_reset(struct srd_decoder_inst *di); SRD_PRIV void srd_inst_free(struct srd_decoder_inst *di); SRD_PRIV void srd_inst_free_all(struct srd_session *sess); @@ -120,7 +118,9 @@ PyMODINIT_FUNC PyInit_sigrokdecode(void); /* util.c */ SRD_PRIV PyObject *py_import_by_name(const char *name); SRD_PRIV int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr); +SRD_PRIV int py_attr_as_strlist(PyObject *py_obj, const char *attr, GSList **outstrlist); SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr); +SRD_PRIV int py_listitem_as_str(PyObject *py_obj, Py_ssize_t idx, char **outstr); SRD_PRIV int py_pydictitem_as_str(PyObject *py_obj, PyObject *py_key, char **outstr); SRD_PRIV int py_pydictitem_as_long(PyObject *py_obj, PyObject *py_key, uint64_t *out); SRD_PRIV int py_str_as_str(PyObject *py_str, char **outstr);