X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fapi.c;h=f738dce49479c594bfd21d781fc99ac0d80706ca;hb=045e9a99186396694fb10f3155a7fb868705ecb8;hp=63c98821d7de00ad6a7b56b4d3c9420249d986f9;hpb=eea49cf10d4cf5b990dcf24b4ead2977a5f36a6e;p=libsigrok.git

diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c
index 63c98821..f738dce4 100644
--- a/hardware/openbench-logic-sniffer/api.c
+++ b/hardware/openbench-logic-sniffer/api.c
@@ -32,9 +32,27 @@ static const int32_t hwcaps[] = {
 	SR_CONF_TRIGGER_TYPE,
 	SR_CONF_CAPTURE_RATIO,
 	SR_CONF_LIMIT_SAMPLES,
+	SR_CONF_EXTERNAL_CLOCK,
+	SR_CONF_PATTERN_MODE,
+	SR_CONF_SWAP,
 	SR_CONF_RLE,
 };
 
+#define STR_PATTERN_EXTERNAL "external"
+#define STR_PATTERN_INTERNAL "internal"
+
+/* Supported methods of test pattern outputs */
+enum {
+	/**
+	 * Capture pins 31:16 (unbuffered wing) output a test pattern
+	 * that can captured on pins 0:15.
+	 */
+	PATTERN_EXTERNAL,
+
+	/** Route test pattern internally to capture buffer. */
+	PATTERN_INTERNAL,
+};
+
 /* Probes are numbered 0-31 (on the PCB silkscreen). */
 SR_PRIV const char *ols_probe_names[NUM_PROBES + 1] = {
 	"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12",
@@ -235,6 +253,12 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
 	case SR_CONF_LIMIT_SAMPLES:
 		*data = g_variant_new_uint64(devc->limit_samples);
 		break;
+	case SR_CONF_PATTERN_MODE:
+		if (devc->flag_reg & FLAG_EXTERNAL_TEST_MODE)
+			*data = g_variant_new_string(STR_PATTERN_EXTERNAL);
+		else if (devc->flag_reg & FLAG_INTERNAL_TEST_MODE)
+			*data = g_variant_new_string(STR_PATTERN_INTERNAL);
+		break;
 	case SR_CONF_RLE:
 		*data = g_variant_new_boolean(devc->flag_reg & FLAG_RLE ? TRUE : FALSE);
 		break;
@@ -250,6 +274,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 	int ret;
 	uint64_t tmp_u64;
+	const char *stropt;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
@@ -278,6 +303,40 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 		} else
 			ret = SR_OK;
 		break;
+	case SR_CONF_EXTERNAL_CLOCK:
+		if (g_variant_get_boolean(data)) {
+			sr_info("Enabling external clock.");
+			devc->flag_reg |= FLAG_CLOCK_EXTERNAL;
+		} else {
+			sr_info("Disabled external clock.");
+			devc->flag_reg &= ~FLAG_CLOCK_EXTERNAL;
+		}
+		ret = SR_OK;
+		break;
+	case SR_CONF_PATTERN_MODE:
+		stropt = g_variant_get_string(data, NULL);
+		ret = SR_OK;
+		if (!strcmp(stropt, STR_PATTERN_INTERNAL)) {
+			sr_info("Enabling internal test mode.");
+			devc->flag_reg |= FLAG_INTERNAL_TEST_MODE;
+		} else if (!strcmp(stropt, STR_PATTERN_EXTERNAL)) {
+			sr_info("Enabling external test mode.");
+			devc->flag_reg |= FLAG_EXTERNAL_TEST_MODE;
+		} else {
+			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.");
@@ -430,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;
@@ -456,6 +517,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);