X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=instance.c;h=e4f8ff7797f2da6fbbdf8064c9561622e1f7a9d9;hp=ab1e0a21d0b9b199e73a622418e1ce8e0b14fcc5;hb=866a80dbed40dcd295efd4c7f28288b7835c973d;hpb=4ccebbd355fb53177dcc46476a5e5105f4859410 diff --git a/instance.c b/instance.c index ab1e0a2..e4f8ff7 100644 --- a/instance.c +++ b/instance.c @@ -576,62 +576,6 @@ SRD_API struct srd_decoder_inst *srd_inst_find_by_id(struct srd_session *sess, return di; } -static struct srd_decoder_inst *srd_sess_inst_find_by_obj( - struct srd_session *sess, const GSList *stack, - const PyObject *obj) -{ - const GSList *l; - struct srd_decoder_inst *tmp, *di; - - if (!sess) - return NULL; - - di = NULL; - for (l = stack ? stack : sess->di_list; di == NULL && l != NULL; l = l->next) { - tmp = l->data; - if (tmp->py_inst == obj) - di = tmp; - else if (tmp->next_di) - di = srd_sess_inst_find_by_obj(sess, tmp->next_di, obj); - } - - return di; -} - -/** - * Find a decoder instance by its Python object. - * - * I.e. find that instance's instantiation of the sigrokdecode.Decoder class. - * This will recurse to find the instance anywhere in the stack tree of all - * sessions. - * - * @param stack Pointer to a GSList of struct srd_decoder_inst, indicating the - * stack to search. To start searching at the bottom level of - * decoder instances, pass NULL. - * @param obj The Python class instantiation. - * - * @return Pointer to struct srd_decoder_inst, or NULL if not found. - * - * @private - * - * @since 0.1.0 - */ -SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(const GSList *stack, - const PyObject *obj) -{ - struct srd_decoder_inst *di; - struct srd_session *sess; - GSList *l; - - di = NULL; - for (l = sessions; di == NULL && l != NULL; l = l->next) { - sess = l->data; - di = srd_sess_inst_find_by_obj(sess, stack, obj); - } - - return di; -} - /** * Set the list of initial (assumed) pin values. * @@ -771,7 +715,8 @@ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di) * * @private */ -static gboolean sample_matches(uint8_t old_sample, uint8_t sample, struct srd_term *term) +__attribute__((always_inline)) +static inline gboolean sample_matches(uint8_t old_sample, uint8_t sample, struct srd_term *term) { /* Caller ensures term != NULL. */