X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=hardware%2Fopenbench-logic-sniffer%2Fapi.c;h=7302860863a50dd899c997195e34f90de3ef4d9f;hb=6a53bde6716ce761af11e2bf34527ece629d0c21;hp=eb7275a34fa2a48b2e1d2f5e20c1e567d1e94e38;hpb=03f4de8cf298b6ca8510f49377c2e8e43cc88516;p=libsigrok.git

diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c
index eb7275a3..73028608 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",
@@ -53,9 +71,14 @@ static const uint64_t samplerates[] = {
 SR_PRIV struct sr_dev_driver ols_driver_info;
 static struct sr_dev_driver *di = &ols_driver_info;
 
+static int dev_clear(void)
+{
+	return std_dev_clear(di, NULL);
+}
+
 static int init(struct sr_context *sr_ctx)
 {
-	return std_hw_init(sr_ctx, di, LOG_PREFIX);
+	return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)
@@ -72,8 +95,6 @@ static GSList *scan(GSList *options)
 	const char *conn, *serialcomm;
 	char buf[8];
 
-	(void)options;
-
 	drvc = di->priv;
 
 	devices = NULL;
@@ -209,9 +230,9 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int dev_clear(void)
+static int cleanup(void)
 {
-	return std_dev_clear(di, NULL);
+	return dev_clear();
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
@@ -232,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;
@@ -247,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;
@@ -275,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.");
@@ -427,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;
@@ -441,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)
@@ -453,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);
@@ -464,7 +528,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-	/* Avoid compiler warnings. */
 	(void)cb_data;
 
 	abort_acquisition(sdi);
@@ -477,7 +540,7 @@ SR_PRIV struct sr_dev_driver ols_driver_info = {
 	.longname = "Openbench Logic Sniffer",
 	.api_version = 1,
 	.init = init,
-	.cleanup = dev_clear,
+	.cleanup = cleanup,
 	.scan = scan,
 	.dev_list = dev_list,
 	.dev_clear = dev_clear,