srd: maxim_ds28ea00: Cosmetics, cleanups.

[libsigrokdecode.git] / type_logic.c

diff --git a/type_logic.c b/type_logic.c
index 2f7923425b08bae786db5e106bdc153864ae1584..098e34d84d3af9d1471fa936ec17a0cec254efa2 100644 (file)
--- a/type_logic.c
+++ b/type_logic.c
@@ -22,55 +22,65 @@
 #include <inttypes.h>
 #include <string.h>
 
-
-PyObject *srd_logic_iter(PyObject *self)
+static PyObject *srd_logic_iter(PyObject *self)
 {
-
        return self;
 }
 
-PyObject *srd_logic_iternext(PyObject *self)
+static PyObject *srd_logic_iternext(PyObject *self)
 {
+       int i;
        PyObject *py_samplenum, *py_samples;
        srd_logic *logic;
        uint64_t sample;
-       int i;
-       unsigned char probe_samples[SRD_MAX_NUM_PROBES];
+       uint8_t probe_samples[SRD_MAX_NUM_PROBES + 1];
 
-       logic = (srd_logic *) self;
-       if (logic->itercnt >= logic->inbuflen / logic->di->unitsize) {
+       logic = (srd_logic *)self;
+       if (logic->itercnt >= logic->inbuflen / logic->di->data_unitsize) {
                /* End iteration loop. */
                return NULL;
        }
 
-       /* TODO: use number of probes defined in the PD, in the order the PD
-        * defined them -- not whatever came in from the driver.
-        */
-       /* Convert the bit-packed sample to an array of bytes, with only 0x01
+       /*
+        * Convert the bit-packed sample to an array of bytes, with only 0x01
         * and 0x00 values, so the PD doesn't need to do any bitshifting.
         */
-       memcpy(&sample, logic->inbuf + logic->itercnt * logic->di->unitsize,
-                       logic->di->unitsize);
-       for (i = 0; i < logic->di->num_probes; i++) {
-               probe_samples[i] = sample & 0x01;
-               sample >>= 1;
-       }
 
-       /* TODO: samplenum should be in the inbuf feed, instead of time/duration.
-        * fake it for now...
+       /* Get probe bits into the 'sample' variable. */
+       memcpy(&sample,
+              logic->inbuf + logic->itercnt * logic->di->data_unitsize,
+              logic->di->data_unitsize);
+
+       /* All probe values (required + optional) are pre-set to 42. */
+       memset(probe_samples, 42, logic->di->dec_num_probes);
+       /* TODO: None or -1 in Python would be better. */
+
+       /*
+        * Set probe values of specified/used probes to their resp. values.
+        * Unused probe values (those not specified by the user) remain at 42.
         */
+       for (i = 0; i < logic->di->dec_num_probes; i++) {
+               /* A probemap value of -1 means "unused optional probe". */
+               if (logic->di->dec_probemap[i] == -1)
+                       continue;
+               probe_samples[i] = sample & (1 << logic->di->dec_probemap[i]) ? 1 : 0;
+       }
+
        /* Prepare the next samplenum/sample list in this iteration. */
-       py_samplenum = PyLong_FromUnsignedLongLong(logic->itercnt++);
+       py_samplenum =
+           PyLong_FromUnsignedLongLong(logic->start_samplenum +
+                                       logic->itercnt);
        PyList_SetItem(logic->sample, 0, py_samplenum);
        py_samples = PyBytes_FromStringAndSize((const char *)probe_samples,
-                       logic->di->num_probes);
+                                              logic->di->dec_num_probes);
        PyList_SetItem(logic->sample, 1, py_samples);
        Py_INCREF(logic->sample);
+       logic->itercnt++;
 
        return logic->sample;
 }
 
-PyTypeObject srd_logic_type = {
+SRD_PRIV PyTypeObject srd_logic_type = {
        PyVarObject_HEAD_INIT(NULL, 0)
        .tp_name = "srd_logic",
        .tp_basicsize = sizeof(srd_logic),
@@ -79,4 +89,3 @@ PyTypeObject srd_logic_type = {
        .tp_iter = srd_logic_iter,
        .tp_iternext = srd_logic_iternext,
 };
-