X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=libsigrokdecode-internal.h;h=6fb590cff7ce8d4c5d1139aee9ca8b7eee44214e;hp=9db255c51a28c5e1f54fcac7990ad00854038bb6;hb=b66bfd9573bada4d3249e9029e6c6c6112d7b4ac;hpb=4539e9ca58966ce3c9cad4801b16c315e86ace01 diff --git a/libsigrokdecode-internal.h b/libsigrokdecode-internal.h index 9db255c..6fb590c 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; @@ -81,11 +81,12 @@ 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, GSList *stack); +SRD_PRIV void srd_inst_free_all(struct srd_session *sess); /* log.c */ #if defined(G_OS_WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) @@ -120,7 +121,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);