From: Wolfram Sang <redacted>
Date: Wed, 2 Jan 2019 12:15:17 +0000 (+0100)
Subject: ols: drop wrong usage of macro
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=be15c51ed49fcd5b725e1174247c92ee295b2b3b;ds=sidebyside

ols: drop wrong usage of macro

commit f51acd69 ("ols: combine demux samples") wrongly replaced the bit
pattern of 0x20 with the number of channels which just happens to be 32
as well. So, the code works but is confusing to read. Reword the
for-loop to make it more comprehensible.

Signed-off-by: Wolfram Sang <redacted>
---

diff --git a/src/hardware/openbench-logic-sniffer/protocol.c b/src/hardware/openbench-logic-sniffer/protocol.c
index 3bfb890f..0041b21a 100644
--- a/src/hardware/openbench-logic-sniffer/protocol.c
+++ b/src/hardware/openbench-logic-sniffer/protocol.c
@@ -365,7 +365,7 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
 	}
 
 	num_ols_changrp = 0;
-	for (i = NUM_CHANNELS; i > 0x02; i /= 2) {
+	for (i = 0x20; i > 0x02; i >>= 1) {
 		if ((devc->flag_reg & i) == 0) {
 			num_ols_changrp++;
 		}