X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=type_logic.c;h=a33d9976dc5d42ba7b216abab39d0581ab9ff91a;hp=6f266aa11110e0f39133f43c72c050530e0c6e53;hb=dcfb60a1658243c3130774fe00645e7fedb23211;hpb=50bd5d259677faf87bb3408e111d0e833d7ba9b4
diff --git a/type_logic.c b/type_logic.c
index 6f266aa..a33d997 100644
--- a/type_logic.c
+++ b/type_logic.c
@@ -17,7 +17,8 @@
* along with this program. If not, see .
*/
-#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
#include "config.h"
#include
#include
@@ -29,11 +30,10 @@ static PyObject *srd_logic_iter(PyObject *self)
static PyObject *srd_logic_iternext(PyObject *self)
{
- int i;
- PyObject *py_samplenum, *py_samples;
srd_logic *logic;
- uint64_t sample;
- uint8_t probe_samples[SRD_MAX_NUM_PROBES + 1];
+ PyObject *py_samplenum, *py_samples;
+ uint8_t *sample_pos, sample;
+ int byte_offset, bit_offset, i;
logic = (srd_logic *)self;
if (logic->itercnt >= logic->inbuflen / logic->di->data_unitsize) {
@@ -45,25 +45,18 @@ static PyObject *srd_logic_iternext(PyObject *self)
* 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.
*/
-
- /* 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;
+ sample_pos = logic->inbuf + logic->itercnt * logic->di->data_unitsize;
+ for (i = 0; i < logic->di->dec_num_channels; i++) {
+ /* A channelmap value of -1 means "unused optional channel". */
+ if (logic->di->dec_channelmap[i] == -1) {
+ /* Value of unused channel is 0xff, instead of 0 or 1. */
+ logic->di->channel_samples[i] = 0xff;
+ } else {
+ byte_offset = logic->di->dec_channelmap[i] / 8;
+ bit_offset = logic->di->dec_channelmap[i] % 8;
+ sample = *(sample_pos + byte_offset) & (1 << bit_offset) ? 1 : 0;
+ logic->di->channel_samples[i] = sample;
+ }
}
/* Prepare the next samplenum/sample list in this iteration. */
@@ -71,8 +64,8 @@ static PyObject *srd_logic_iternext(PyObject *self)
PyLong_FromUnsignedLongLong(logic->start_samplenum +
logic->itercnt);
PyList_SetItem(logic->sample, 0, py_samplenum);
- py_samples = PyBytes_FromStringAndSize((const char *)probe_samples,
- logic->di->dec_num_probes);
+ py_samples = PyBytes_FromStringAndSize((const char *)logic->di->channel_samples,
+ logic->di->dec_num_channels);
PyList_SetItem(logic->sample, 1, py_samples);
Py_INCREF(logic->sample);
logic->itercnt++;