X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=type_logic.c;h=a33d9976dc5d42ba7b216abab39d0581ab9ff91a;hp=367ff1db5dd2d15e683d3c5386e13c0d9b54d80b;hb=fbff319f0a65e2d87a609f77a32b26ef200a5215;hpb=37b94c205e4c1c43e77e29993108f23066cbce05
diff --git a/type_logic.c b/type_logic.c
index 367ff1d..a33d997 100644
--- a/type_logic.c
+++ b/type_logic.c
@@ -17,7 +17,8 @@
* along with this program. If not, see .
*/
-#include "libsigrokdecode.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
@@ -45,16 +46,16 @@ static PyObject *srd_logic_iternext(PyObject *self)
* and 0x00 values, so the PD doesn't need to do any bitshifting.
*/
sample_pos = logic->inbuf + logic->itercnt * logic->di->data_unitsize;
- 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) {
- /* Value of unused probe is 0xff, instead of 0 or 1. */
- logic->di->probe_samples[i] = 0xff;
+ 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_probemap[i] / 8;
- bit_offset = logic->di->dec_probemap[i] % 8;
+ 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->probe_samples[i] = sample;
+ logic->di->channel_samples[i] = sample;
}
}
@@ -63,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 *)logic->di->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++;