From c36a7d84ca3603705c72bd0e026edec9f8869db9 Mon Sep 17 00:00:00 2001 From: v1ne Date: Tue, 31 Mar 2020 20:21:47 +0200 Subject: [PATCH] ols: Clear "disabled groups" flags before setting them This fixes a bug where the channel group setting would not be overwritten in a new run, but instead the channel group settings of both runs would be merged together. --- src/hardware/openbench-logic-sniffer/api.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c index 8e4efb94..a9812ce9 100644 --- a/src/hardware/openbench-logic-sniffer/api.c +++ b/src/hardware/openbench-logic-sniffer/api.c @@ -497,10 +497,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) devc->capture_flags & CAPTURE_FLAG_RLE ? "on" : "off", devc->capture_flags & CAPTURE_FLAG_NOISE_FILTER ? "on": "off", devc->capture_flags & CAPTURE_FLAG_DEMUX ? "on" : "off"); + /* * Enable/disable OLS channel groups in the flag register according * to the channel mask. 1 means "disable channel". */ + devc->capture_flags &= ~0x3c; devc->capture_flags |= ~(ols_changrp_mask << 2) & 0x3c; /* RLE mode is always zero, for now. */ -- 2.30.2