X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=type_logic.c;h=ba356c0a9526246d953138275dd21aff4e9a4a04;hb=64922f694d78f23f4960baa3a161f01a7ed9cf26;hp=436768033c78809e249fafd4895290d003a2512b;hpb=6a15597a7b3f901b566b7bfc8c484a14e0fb6a11;p=libsigrokdecode.git
diff --git a/type_logic.c b/type_logic.c
index 4367680..ba356c0 100644
--- a/type_logic.c
+++ b/type_logic.c
@@ -17,8 +17,9 @@
* along with this program. If not, see .
*/
-#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "config.h"
+#include
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
#include
#include
@@ -60,7 +61,7 @@ static PyObject *srd_logic_iternext(PyObject *self)
/* Prepare the next samplenum/sample list in this iteration. */
py_samplenum =
- PyLong_FromUnsignedLongLong(logic->start_samplenum +
+ PyLong_FromUnsignedLongLong(logic->abs_start_samplenum +
logic->itercnt);
PyList_SetItem(logic->sample, 0, py_samplenum);
py_samples = PyBytes_FromStringAndSize((const char *)logic->di->channel_samples,
@@ -72,14 +73,25 @@ static PyObject *srd_logic_iternext(PyObject *self)
return logic->sample;
}
-/** @cond PRIVATE */
-SRD_PRIV PyTypeObject srd_logic_type = {
- PyVarObject_HEAD_INIT(NULL, 0)
- .tp_name = "srd_logic",
- .tp_basicsize = sizeof(srd_logic),
- .tp_flags = Py_TPFLAGS_DEFAULT,
- .tp_doc = "Sigrokdecode logic sample object",
- .tp_iter = srd_logic_iter,
- .tp_iternext = srd_logic_iternext,
-};
-/** @endcond */
+/** Create the srd_logic type.
+ * @return The new type object.
+ * @private
+ */
+SRD_PRIV PyObject *srd_logic_type_new(void)
+{
+ PyType_Spec spec;
+ PyType_Slot slots[] = {
+ { Py_tp_doc, "sigrokdecode logic sample object" },
+ { Py_tp_iter, (void *)&srd_logic_iter },
+ { Py_tp_iternext, (void *)&srd_logic_iternext },
+ { Py_tp_new, (void *)&PyType_GenericNew },
+ { 0, NULL }
+ };
+ spec.name = "srd_logic";
+ spec.basicsize = sizeof(srd_logic);
+ spec.itemsize = 0;
+ spec.flags = Py_TPFLAGS_DEFAULT;
+ spec.slots = slots;
+
+ return PyType_FromSpec(&spec);
+}