X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fapi.c;h=47a938b0f5c6f840afad7eb81046e8bec96dfec3;hb=a4e435eb49c1fa30c31d5851b404001324cafe33;hp=af38e4ff8449be2cda322a5f409bbefda988f70e;hpb=a66307424e7a14df8f53e04d5ff77436dbaa830f;p=libsigrok.git

diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c
index af38e4ff..47a938b0 100644
--- a/hardware/openbench-logic-sniffer/api.c
+++ b/hardware/openbench-logic-sniffer/api.c
@@ -30,7 +30,7 @@ static const int32_t hwopts[] = {
 static const int32_t hwcaps[] = {
 	SR_CONF_LOGIC_ANALYZER,
 	SR_CONF_SAMPLERATE,
-	SR_CONF_TRIGGER_TYPE,
+	SR_CONF_TRIGGER_MATCH,
 	SR_CONF_CAPTURE_RATIO,
 	SR_CONF_LIMIT_SAMPLES,
 	SR_CONF_EXTERNAL_CLOCK,
@@ -39,6 +39,11 @@ static const int32_t hwcaps[] = {
 	SR_CONF_RLE,
 };
 
+static const int32_t trigger_matches[] = {
+	SR_TRIGGER_ZERO,
+	SR_TRIGGER_ONE,
+};
+
 #define STR_PATTERN_NONE     "None"
 #define STR_PATTERN_EXTERNAL "External"
 #define STR_PATTERN_INTERNAL "Internal"
@@ -61,8 +66,8 @@ static const char *patterns[] = {
 	STR_PATTERN_INTERNAL,
 };
 
-/* Probes are numbered 0-31 (on the PCB silkscreen). */
-SR_PRIV const char *ols_probe_names[NUM_PROBES + 1] = {
+/* Channels are numbered 0-31 (on the PCB silkscreen). */
+SR_PRIV const char *ols_channel_names[NUM_CHANNELS + 1] = {
 	"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12",
 	"13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23",
 	"24", "25", "26", "27", "28", "29", "30", "31",
@@ -90,7 +95,7 @@ static GSList *scan(GSList *options)
 	struct sr_dev_inst *sdi;
 	struct drv_context *drvc;
 	struct dev_context *devc;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	struct sr_serial_dev_inst *serial;
 	GPollFD probefd;
 	GSList *l, *devices;
@@ -177,10 +182,10 @@ static GSList *scan(GSList *options)
 				"Sump", "Logic Analyzer", "v1.0");
 		sdi->driver = di;
 		for (i = 0; i < 32; i++) {
-			if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE,
-					ols_probe_names[i])))
+			if (!(ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
+					ols_channel_names[i])))
 				return 0;
-			sdi->probes = g_slist_append(sdi->probes, probe);
+			sdi->channels = g_slist_append(sdi->channels, ch);
 		}
 		devc = ols_dev_new();
 		sdi->priv = devc;
@@ -189,8 +194,6 @@ static GSList *scan(GSList *options)
 	if (ols_set_samplerate(sdi, DEFAULT_SAMPLERATE) != SR_OK)
 		sr_dbg("Failed to set default samplerate (%"PRIu64").",
 				DEFAULT_SAMPLERATE);
-	/* Clear trigger masks, values and stages. */
-	ols_configure_probes(sdi);
 	sdi->inst_type = SR_INST_SERIAL;
 	sdi->conn = serial;
 
@@ -213,11 +216,11 @@ static int cleanup(void)
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_probe_group *probe_group)
+		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 
-	(void)probe_group;
+	(void)cg;
 
 	if (!sdi)
 		return SR_ERR_ARG;
@@ -252,7 +255,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
-		const struct sr_probe_group *probe_group)
+		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	uint16_t flag;
@@ -260,7 +263,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 	int ret;
 	const char *stropt;
 
-	(void)probe_group;
+	(void)cg;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
@@ -323,10 +326,10 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 	case SR_CONF_SWAP:
 		if (g_variant_get_boolean(data)) {
 			sr_info("Enabling channel swapping.");
-			devc->flag_reg |= FLAG_SWAP_PROBES;
+			devc->flag_reg |= FLAG_SWAP_CHANNELS;
 		} else {
 			sr_info("Disabling channel swapping.");
-			devc->flag_reg &= ~FLAG_SWAP_PROBES;
+			devc->flag_reg &= ~FLAG_SWAP_CHANNELS;
 		}
 		ret = SR_OK;
 		break;
@@ -349,14 +352,14 @@ 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)
+		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	GVariant *gvar, *grange[2];
 	GVariantBuilder gvb;
-	int num_channels, i;
+	int num_ols_changrp, i;
 
-	(void)probe_group;
+	(void)cg;
 
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS:
@@ -374,8 +377,10 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		g_variant_builder_add(&gvb, "{sv}", "samplerate-steps", gvar);
 		*data = g_variant_builder_end(&gvb);
 		break;
-	case SR_CONF_TRIGGER_TYPE:
-		*data = g_variant_new_string(TRIGGER_TYPE);
+	case SR_CONF_TRIGGER_MATCH:
+		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+				trigger_matches, ARRAY_SIZE(trigger_matches),
+				sizeof(int32_t));
 		break;
 	case SR_CONF_PATTERN_MODE:
 		*data = g_variant_new_strv(patterns, ARRAY_SIZE(patterns));
@@ -390,17 +395,20 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 			/* 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
+		 * Channel groups are turned off if no channels in that group are
 		 * enabled, making more room for samples for the enabled group.
 		*/
-		ols_configure_probes(sdi);
-		num_channels = 0;
+		ols_channel_mask(sdi);
+		num_ols_changrp = 0;
 		for (i = 0; i < 4; i++) {
-			if (devc->probe_mask & (0xff << (i * 8)))
-				num_channels++;
+			if (devc->channel_mask & (0xff << (i * 8)))
+				num_ols_changrp++;
 		}
 		grange[0] = g_variant_new_uint64(MIN_NUM_SAMPLES);
-		grange[1] = g_variant_new_uint64(devc->max_samples / num_channels);
+		if (num_ols_changrp)
+			grange[1] = g_variant_new_uint64(devc->max_samples / num_ols_changrp);
+		else
+			grange[1] = g_variant_new_uint64(MIN_NUM_SAMPLES);
 		*data = g_variant_new_tuple(grange, 2);
 		break;
 	default:
@@ -453,8 +461,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 	uint16_t samplecount, readcount, delaycount;
-	uint8_t changrp_mask, arg[4];
-	int num_channels;
+	uint8_t ols_changrp_mask, arg[4];
+	int num_ols_changrp;
 	int ret, i;
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -463,22 +471,14 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	devc = sdi->priv;
 	serial = sdi->conn;
 
-	if (ols_configure_probes(sdi) != SR_OK) {
-		sr_err("Failed to configure probes.");
-		return SR_ERR;
-	}
+	ols_channel_mask(sdi);
 
-	/*
-	 * Enable/disable channel groups in the flag register according to the
-	 * probe mask. Calculate this here, because num_channels is needed
-	 * to limit readcount.
-	 */
-	changrp_mask = 0;
-	num_channels = 0;
+	num_ols_changrp = 0;
+	ols_changrp_mask = 0;
 	for (i = 0; i < 4; i++) {
-		if (devc->probe_mask & (0xff << (i * 8))) {
-			changrp_mask |= (1 << i);
-			num_channels++;
+		if (devc->channel_mask & (0xff << (i * 8))) {
+			ols_changrp_mask |= (1 << i);
+			num_ols_changrp++;
 		}
 	}
 
@@ -486,7 +486,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	 * Limit readcount to prevent reading past the end of the hardware
 	 * buffer.
 	 */
-	samplecount = MIN(devc->max_samples / num_channels, devc->limit_samples);
+	samplecount = MIN(devc->max_samples / num_ols_changrp, devc->limit_samples);
 	readcount = samplecount / 4;
 
 	/* Rather read too many samples than too few. */
@@ -494,12 +494,15 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 		readcount++;
 
 	/* Basic triggers. */
-	if (devc->trigger_mask[0] != 0x00000000) {
-		/* At least one probe has a trigger on it. */
+	if (ols_convert_trigger(sdi) != SR_OK) {
+		sr_err("Failed to configure channels.");
+		return SR_ERR;
+	}
+	if (devc->num_stages > 0) {
 		delaycount = readcount * (1 - devc->capture_ratio / 100.0);
 		devc->trigger_at = (readcount - delaycount) * 4 - devc->num_stages;
 		for (i = 0; i <= devc->num_stages; i++) {
-			sr_dbg("Setting stage %d trigger.", i);
+			sr_dbg("Setting OLS stage %d trigger.", i);
 			if ((ret = set_trigger(sdi, i)) != SR_OK)
 				return ret;
 		}
@@ -538,8 +541,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 			devc->flag_reg & FLAG_RLE ? "on" : "off",
 			devc->flag_reg & FLAG_FILTER ? "on": "off",
 			devc->flag_reg & FLAG_DEMUX ? "on" : "off");
-	/* 1 means "disable channel". */
-	devc->flag_reg |= ~(changrp_mask << 2) & 0x3c;
+	/*
+	 * Enable/disable OLS channel groups in the flag register according
+	 * to the channel mask. 1 means "disable channel".
+	 */
+	devc->flag_reg |= ~(ols_changrp_mask << 2) & 0x3c;
 	arg[0] = devc->flag_reg & 0xff;
 	arg[1] = devc->flag_reg >> 8;
 	arg[2] = arg[3] = 0x00;