Use uint8_t instead of unsigned char for raw byte data

[libsigrokdecode.git] / instance.c

diff --git a/instance.c b/instance.c
index 36fb2d0c32889b609712ba6dc2f42a00f1aecda2..c30b46b7ecd37348c17e9007efce47951214ebe8 100644 (file)
--- a/instance.c
+++ b/instance.c
@@ -167,7 +167,7 @@ SRD_API int srd_inst_option_set(struct srd_decoder_inst *di,
                        }
                } else if (g_variant_is_of_type(value, G_VARIANT_TYPE_INT64)) {
                        val_int = g_variant_get_int64(value);
-                       if (!(py_optval = PyLong_FromLong(val_int))) {
+                       if (!(py_optval = PyLong_FromLongLong(val_int))) {
                                /* ValueError Exception */
                                PyErr_Clear();
                                srd_err("Option '%s' has invalid integer value.", sdo->id);
@@ -699,7 +699,7 @@ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di)
        Py_DECREF(py_res);
 
        /* Set self.samplenum to 0. */
-       py_samplenum = PyLong_FromLong(0);
+       py_samplenum = PyLong_FromUnsignedLongLong(0);
        PyObject_SetAttrString(di->py_inst, "samplenum", py_samplenum);
        Py_DECREF(py_samplenum);
 
@@ -895,6 +895,8 @@ static gboolean all_terms_match(const struct srd_decoder_inst *di,
 
        for (l = cond; l; l = l->next) {
                term = l->data;
+               if (term->type == SRD_TERM_ALWAYS_FALSE)
+                       return FALSE;
                if (!term_matches(di, term, sample_pos))
                        return FALSE;
        }
@@ -1232,12 +1234,53 @@ SRD_PRIV int srd_inst_decode(struct srd_decoder_inst *di,
                g_cond_wait(&di->handled_all_samples_cond, &di->data_mutex);
        g_mutex_unlock(&di->data_mutex);
 
+       /* Flush all PDs in the stack that can be flushed */
+       srd_inst_flush(di);
+
        if (di->want_wait_terminate)
                return SRD_ERR_TERM_REQ;
 
        return SRD_OK;
 }
 
+
+/**
+ * Flush all data that is pending, bottom decoder first up to the top of the stack.
+ *
+ * @param di The decoder instance to call. Must not be NULL.
+ *
+ * @return SRD_OK upon success, a (negative) error code otherwise.
+ *
+ * @private
+ */
+SRD_PRIV int srd_inst_flush(struct srd_decoder_inst *di)
+{
+       PyGILState_STATE gstate;
+       PyObject *py_ret;
+       GSList *l;
+       int ret;
+
+       if (!di)
+               return SRD_ERR_ARG;
+
+       gstate = PyGILState_Ensure();
+       if (PyObject_HasAttrString(di->py_inst, "flush")) {
+               srd_dbg("Calling flush() of instance %s", di->inst_id);
+               py_ret = PyObject_CallMethod(di->py_inst, "flush", NULL);
+               Py_XDECREF(py_ret);
+       }
+       PyGILState_Release(gstate);
+
+       /* Pass the "flush" request to all stacked decoders. */
+       for (l = di->next_di; l; l = l->next) {
+               ret = srd_inst_flush(l->data);
+               if (ret != SRD_OK)
+                       return ret;
+       }
+
+       return di->decoder_state;
+}
+
 /**
  * Terminate current decoder work, prepare for re-use on new input data.
  *