X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fapi.c;h=7302860863a50dd899c997195e34f90de3ef4d9f;hb=21d464a7e53efc9ac9810d9301a12b6a56fdb061;hp=87e430806af78d60c96f461a2384978c0ee479a2;hpb=eb1b610b1281bd83cb4dbd02b2eccdf4888bb093;p=libsigrok.git

diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c
index 87e43080..73028608 100644
--- a/hardware/openbench-logic-sniffer/api.c
+++ b/hardware/openbench-logic-sniffer/api.c
@@ -34,6 +34,7 @@ static const int32_t hwcaps[] = {
 	SR_CONF_LIMIT_SAMPLES,
 	SR_CONF_EXTERNAL_CLOCK,
 	SR_CONF_PATTERN_MODE,
+	SR_CONF_SWAP,
 	SR_CONF_RLE,
 };
 
@@ -325,6 +326,17 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 			ret = SR_ERR;
 		}
 		break;
+	case SR_CONF_SWAP:
+		if (g_variant_get_boolean(data)) {
+			sr_info("Enabling channel swapping.");
+			devc->flag_reg |= FLAG_SWAP_PROBES;
+		} else {
+			sr_info("Disabling channel swapping.");
+			devc->flag_reg &= ~FLAG_SWAP_PROBES;
+		}
+		ret = SR_OK;
+		break;
+
 	case SR_CONF_RLE:
 		if (g_variant_get_boolean(data)) {
 			sr_info("Enabling RLE.");
@@ -477,8 +489,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	}
 
 	sr_info("Setting samplerate to %" PRIu64 "Hz (divider %u, "
-		"demux %s)", devc->cur_samplerate, devc->cur_samplerate_divider,
-		devc->flag_reg & FLAG_DEMUX ? "on" : "off");
+		"demux %s, noise_filter %s)", devc->cur_samplerate,
+		devc->cur_samplerate_divider,
+		devc->flag_reg & FLAG_DEMUX ? "on" : "off",
+		devc->flag_reg & FLAG_FILTER ? "on": "off");
 	if (send_longcommand(serial, CMD_SET_DIVIDER,
 			reverse32(devc->cur_samplerate_divider)) != SR_OK)
 		return SR_ERR;
@@ -491,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)
@@ -503,6 +516,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 	/* Reset all operational states. */
 	devc->num_transfers = devc->num_samples = devc->num_bytes = 0;
+	memset(devc->sample, 0, 4);
 
 	/* Send header packet to the session bus. */
 	std_session_send_df_header(cb_data, LOG_PREFIX);