From: Matt Ranostay <redacted>
Date: Fri, 6 Sep 2013 06:38:59 +0000 (-0700)
Subject: ols: Moved FLAG_FILTER to demux check
X-Git-Tag: libsigrok-0.2.2~61
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=6a53bde6716ce761af11e2bf34527ece629d0c21;p=libsigrok.git

ols: Moved FLAG_FILTER to demux check

Demux mode was having filter mode set which it doesn't
support per FPGA demon core docs.

Signed-off-by: Matt Ranostay <redacted>
---

diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c
index f738dce4..73028608 100644
--- a/hardware/openbench-logic-sniffer/api.c
+++ b/hardware/openbench-logic-sniffer/api.c
@@ -505,7 +505,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 	/* The flag register wants them here, and 1 means "disable channel". */
 	devc->flag_reg |= ~(changrp_mask << 2) & 0x3c;
-	devc->flag_reg |= FLAG_FILTER;
 	devc->rle_count = 0;
 	data = (devc->flag_reg << 24) | ((devc->flag_reg << 8) & 0xff0000);
 	if (send_longcommand(serial, CMD_SET_FLAGS, data) != SR_OK)
diff --git a/hardware/openbench-logic-sniffer/protocol.c b/hardware/openbench-logic-sniffer/protocol.c
index afd0dc6f..d4e04e43 100644
--- a/hardware/openbench-logic-sniffer/protocol.c
+++ b/hardware/openbench-logic-sniffer/protocol.c
@@ -307,6 +307,7 @@ SR_PRIV int ols_set_samplerate(const struct sr_dev_inst *sdi,
 		devc->cur_samplerate_divider = (CLOCK_RATE * 2 / samplerate) - 1;
 	} else {
 		devc->flag_reg &= ~FLAG_DEMUX;
+		devc->flag_reg |= FLAG_FILTER;
 		devc->max_probes = NUM_PROBES;
 		devc->cur_samplerate_divider = (CLOCK_RATE / samplerate) - 1;
 	}