X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fapi.c;h=7852b6ce3ee473b43bcbb1e9f6b39ca0f2404ad8;hb=5413df19528c96c6fba3ee4cc61ec3dfe01047cb;hp=8df4a8cd178739871894394287778f115ff3bcb1;hpb=854434de0bc581f16f87f85595f473ee41ca9e0c;p=libsigrok.git

diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c
index 8df4a8cd..7852b6ce 100644
--- a/hardware/openbench-logic-sniffer/api.c
+++ b/hardware/openbench-logic-sniffer/api.c
@@ -39,8 +39,9 @@ static const int32_t hwcaps[] = {
 	SR_CONF_RLE,
 };
 
-#define STR_PATTERN_EXTERNAL "external"
-#define STR_PATTERN_INTERNAL "internal"
+#define STR_PATTERN_NONE     "None"
+#define STR_PATTERN_EXTERNAL "External"
+#define STR_PATTERN_INTERNAL "Internal"
 
 /* Supported methods of test pattern outputs */
 enum {
@@ -55,6 +56,7 @@ enum {
 };
 
 static const char *patterns[] = {
+	STR_PATTERN_NONE,
 	STR_PATTERN_EXTERNAL,
 	STR_PATTERN_INTERNAL,
 };
@@ -159,7 +161,7 @@ static GSList *scan(GSList *options)
 
 	if (probefd.revents != G_IO_IN)
 		return NULL;
-	if (serial_read(serial, buf, 4) != 4)
+	if (serial_read_blocking(serial, buf, 4) != 4)
 		return NULL;
 	if (strncmp(buf, "1SLO", 4) && strncmp(buf, "1ALS", 4))
 		return NULL;
@@ -241,6 +243,8 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
 			*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);
+		else
+			*data = g_variant_new_string(STR_PATTERN_NONE);
 		break;
 	case SR_CONF_RLE:
 		*data = g_variant_new_boolean(devc->flag_reg & FLAG_RLE ? TRUE : FALSE);
@@ -256,8 +260,9 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 		const struct sr_probe_group *probe_group)
 {
 	struct dev_context *devc;
-	int ret;
+	uint16_t flag;
 	uint64_t tmp_u64;
+	int ret;
 	const char *stropt;
 
 	(void)probe_group;
@@ -302,15 +307,23 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 	case SR_CONF_PATTERN_MODE:
 		stropt = g_variant_get_string(data, NULL);
 		ret = SR_OK;
-		if (!strcmp(stropt, STR_PATTERN_INTERNAL)) {
+		flag = 0xffff;
+		if (!strcmp(stropt, STR_PATTERN_NONE)) {
+			sr_info("Disabling test modes.");
+			flag = 0x0000;
+		}else if (!strcmp(stropt, STR_PATTERN_INTERNAL)) {
 			sr_info("Enabling internal test mode.");
-			devc->flag_reg |= FLAG_INTERNAL_TEST_MODE;
+			flag = FLAG_INTERNAL_TEST_MODE;
 		} else if (!strcmp(stropt, STR_PATTERN_EXTERNAL)) {
 			sr_info("Enabling external test mode.");
-			devc->flag_reg |= FLAG_EXTERNAL_TEST_MODE;
+			flag = FLAG_EXTERNAL_TEST_MODE;
 		} else {
 			ret = SR_ERR;
 		}
+		if (flag != 0xffff) {
+			devc->flag_reg &= ~(FLAG_INTERNAL_TEST_MODE | FLAG_EXTERNAL_TEST_MODE);
+			devc->flag_reg |= flag;
+		}
 		break;
 	case SR_CONF_SWAP:
 		if (g_variant_get_boolean(data)) {
@@ -343,10 +356,11 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_probe_group *probe_group)
 {
-	GVariant *gvar;
+	struct dev_context *devc;
+	GVariant *gvar, *grange[2];
 	GVariantBuilder gvb;
+	int num_channels, i;
 
-	(void)sdi;
 	(void)probe_group;
 
 	switch (key) {
@@ -371,6 +385,29 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 	case SR_CONF_PATTERN_MODE:
 		*data = g_variant_new_strv(patterns, ARRAY_SIZE(patterns));
 		break;
+	case SR_CONF_LIMIT_SAMPLES:
+		if (!sdi)
+			return SR_ERR_ARG;
+		devc = sdi->priv;
+		if (devc->flag_reg & FLAG_RLE)
+			return SR_ERR_NA;
+		if (devc->max_samples == 0)
+			/* Device didn't specify sample memory size in metadata. */
+			return SR_ERR_NA;
+		/*
+		 * Channel groups are turned off if no probes in that group are
+		 * enabled, making more room for samples for the enabled group.
+		*/
+		ols_configure_probes(sdi);
+		num_channels = 0;
+		for (i = 0; i < 4; i++) {
+			if (devc->probe_mask & (0xff << (i * 8)))
+				num_channels++;
+		}
+		grange[0] = g_variant_new_uint64(MIN_NUM_SAMPLES);
+		grange[1] = g_variant_new_uint64(devc->max_samples / num_channels);
+		*data = g_variant_new_tuple(grange, 2);
+		break;
 	default:
 		return SR_ERR_NA;
 	}
@@ -385,7 +422,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	struct sr_serial_dev_inst *serial;
 	uint32_t trigger_config[4];
 	uint32_t data;
-	uint16_t readcount, delaycount;
+	uint16_t samplecount, readcount, delaycount;
 	uint8_t changrp_mask;
 	int num_channels;
 	int i;
@@ -419,7 +456,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	 * Limit readcount to prevent reading past the end of the hardware
 	 * buffer.
 	 */
-	readcount = MIN(devc->max_samples / num_channels, devc->limit_samples) / 4;
+	samplecount = MIN(devc->max_samples / num_channels, devc->limit_samples);
+	readcount = samplecount / 4;
+	if (samplecount % 4)
+		readcount++;
 
 	memset(trigger_config, 0, 16);
 	trigger_config[devc->num_stages] |= 0x08;
@@ -479,24 +519,29 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 		delaycount = readcount;
 	}
 
-	sr_info("Setting samplerate to %" PRIu64 "Hz (divider %u, "
-		"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");
+	/* Samplerate. */
+	sr_info("Setting samplerate to %" PRIu64 "Hz (divider %u)",
+			devc->cur_samplerate, devc->cur_samplerate_divider);
 	if (send_longcommand(serial, CMD_SET_DIVIDER,
 			reverse32(devc->cur_samplerate_divider)) != SR_OK)
 		return SR_ERR;
 
 	/* Send sample limit and pre/post-trigger capture ratio. */
+	sr_info("Setting sample limit %d, trigger point at %d",
+			(readcount - 1) * 4, (delaycount - 1) * 4);
 	data = ((readcount - 1) & 0xffff) << 16;
 	data |= (delaycount - 1) & 0xffff;
 	if (send_longcommand(serial, CMD_CAPTURE_SIZE, reverse16(data)) != SR_OK)
 		return SR_ERR;
 
-	/* The flag register wants them here, and 1 means "disable channel". */
+	/* Flag register. */
+	sr_info("Setting demux %s, noise_filter %s, extpat %s, intpat %s",
+			devc->flag_reg & FLAG_DEMUX ? "on" : "off",
+			devc->flag_reg & FLAG_FILTER ? "on": "off",
+			devc->flag_reg & FLAG_EXTERNAL_TEST_MODE ? "on": "off",
+			devc->flag_reg & FLAG_INTERNAL_TEST_MODE ? "on": "off");
+	/* 1 means "disable channel". */
 	devc->flag_reg |= ~(changrp_mask << 2) & 0x3c;
-	devc->rle_count = 0;
 	data = (devc->flag_reg << 24) | ((devc->flag_reg << 8) & 0xff0000);
 	if (send_longcommand(serial, CMD_SET_FLAGS, data) != SR_OK)
 		return SR_ERR;
@@ -506,7 +551,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 		return SR_ERR;
 
 	/* Reset all operational states. */
-	devc->num_transfers = devc->num_samples = devc->num_bytes = 0;
+	devc->rle_count = devc->num_transfers = 0;
+	devc->num_samples = devc->num_bytes = 0;
 	memset(devc->sample, 0, 4);
 
 	/* Send header packet to the session bus. */