Remove 64-probe limit.

Fixes bug 120.

3 files changed, 25 insertions, 24 deletions

diff --git a/instance.c b/instance.c
index 9295963..6b8d6b4 100644
--- a/instance.c
+++ b/instance.c
@@ -373,8 +373,18 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
 		}
 		for (i = 0; i < di->dec_num_probes; i++)
 			di->dec_probemap[i] = i;
+		di->data_unitsize = (di->dec_num_probes + 7) / 8;
+		/*
+		 * Will be used to prepare a sample at every iteration
+		 * of the instance's decode() method.
+		 */
+		if (!(di->probe_samples = g_try_malloc(di->dec_num_probes))) {
+			srd_err("Failed to g_malloc() sample buffer.");
+			g_free(di->dec_probemap);
+			g_free(di);
+			return NULL;
+		}
 	}
-	di->data_unitsize = (di->dec_num_probes + 7) / 8;
 
 	/* Create a new instance of this decoder class. */
 	if (!(di->py_inst = PyObject_CallObject(dec->py_dec, NULL))) {
diff --git a/libsigrokdecode.h b/libsigrokdecode.h
index 3a72d2c..3175fd8 100644
--- a/libsigrokdecode.h
+++ b/libsigrokdecode.h
@@ -133,8 +133,6 @@ enum {
 	SRD_OUTPUT_META,
 };
 
-#define SRD_MAX_NUM_PROBES 64
-
 enum {
 	SRD_CONF_SAMPLERATE = 10000,
 };
@@ -216,6 +214,7 @@ struct srd_decoder_inst {
 	int dec_num_probes;
 	int *dec_probemap;
 	int data_unitsize;
+	uint8_t *probe_samples;
 	GSList *next_di;
 };
 
diff --git a/type_logic.c b/type_logic.c
index 80e49f1..367ff1d 100644
--- a/type_logic.c
+++ b/type_logic.c
@@ -31,9 +31,8 @@ static PyObject *srd_logic_iternext(PyObject *self)
 {
 	srd_logic *logic;
 	PyObject *py_samplenum, *py_samples;
-	uint64_t sample;
-	uint8_t probe_samples[SRD_MAX_NUM_PROBES + 1];
-	int i;
+	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 +44,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.
-	 */
+	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)
-			continue;
-		probe_samples[i] = sample & (1 << logic->di->dec_probemap[i]) ? 1 : 0;
+		if (logic->di->dec_probemap[i] == -1) {
+			/* Value of unused probe is 0xff, instead of 0 or 1. */
+			logic->di->probe_samples[i] = 0xff;
+		} else {
+			byte_offset = logic->di->dec_probemap[i] / 8;
+			bit_offset = logic->di->dec_probemap[i] % 8;
+			sample = *(sample_pos + byte_offset) & (1 << bit_offset) ? 1 : 0;
+			logic->di->probe_samples[i] = sample;
+		}
 	}
 
 	/* Prepare the next samplenum/sample list in this iteration. */
@@ -71,7 +63,7 @@ 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,
+	py_samples = PyBytes_FromStringAndSize((const char *)logic->di->probe_samples,
 					       logic->di->dec_num_probes);
 	PyList_SetItem(logic->sample, 1, py_samples);
 	Py_INCREF(logic->sample);