]> sigrok.org Git - libsigrok.git/commitdiff
ols: Clear "disabled groups" flags before setting them
authorv1ne <redacted>
Tue, 31 Mar 2020 18:21:47 +0000 (20:21 +0200)
committerGerhard Sittig <redacted>
Wed, 6 Jan 2021 09:45:28 +0000 (10:45 +0100)
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

index 8e4efb9407a88ba725d936dc95c8ac5018504eab..a9812ce96cf1379a88dcb9af92da797c10fd04fa 100644 (file)
@@ -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. */