X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=type_logic.c;h=ba356c0a9526246d953138275dd21aff4e9a4a04;hb=3e18df5daa04fe3851b20909e912489bfe98e6b9;hp=a33d9976dc5d42ba7b216abab39d0581ab9ff91a;hpb=f6c7eade2b8853b3d525b5cc0402e89ca74c1908;p=libsigrokdecode.git
diff --git a/type_logic.c b/type_logic.c
index a33d997..ba356c0 100644
--- a/type_logic.c
+++ b/type_logic.c
@@ -17,9 +17,9 @@
* along with this program. If not, see .
*/
+#include
#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include "libsigrokdecode.h"
-#include "config.h"
#include
#include
@@ -61,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,
@@ -73,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);
+}