From: Joel Holdsworth <redacted>
Date: Mon, 25 Sep 2017 04:07:30 +0000 (-0600)
Subject: dreamsourcelab-dslogic: Fixed deinterleaving when non-contiguous set of channels... 
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=55584d38ddd52ab0952faed16b5aeff21ddcca34;p=libsigrok.git

dreamsourcelab-dslogic: Fixed deinterleaving when non-contiguous set of channels are enabled
---

diff --git a/src/hardware/dreamsourcelab-dslogic/protocol.c b/src/hardware/dreamsourcelab-dslogic/protocol.c
index 3b4848ee..90b773d9 100644
--- a/src/hardware/dreamsourcelab-dslogic/protocol.c
+++ b/src/hardware/dreamsourcelab-dslogic/protocol.c
@@ -733,10 +733,12 @@ static void deinterleave_buffer(const uint8_t *src, size_t length,
 		for (int bit = 0; bit != 64; bit++) {
 			const uint64_t *word_ptr = src_ptr;
 			sample = 0;
-			for (size_t channel = 0; channel != channel_count;
+			for (unsigned int channel = 0; channel != 16;
 				channel++) {
-				if ((channel_mask & (1 << channel)) &&
-					(*word_ptr++ & (1ULL << bit)))
+				const uint16_t m = channel_mask >> channel;
+				if (!m)
+					break;
+				if ((m & 1) && ((*word_ptr++ >> bit) & 1ULL))
 					sample |= 1 << channel;
 			}
 			*dst_ptr++ = sample;