X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fprotocol.c;h=ce20ccf4012f1a5fadd9098b82ef32e10b0a8c50;hb=b172c1301e183646fbe9a2b7e096d9c7ee8e2458;hp=30296da1c3e97acd43422a6342d6672a34c23265;hpb=58c5f2ed1785ead87d1398c28b5dbe60ba4610dd;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/protocol.c b/hardware/zeroplus-logic-cube/protocol.c
index 30296da1..ce20ccf4 100644
--- a/hardware/zeroplus-logic-cube/protocol.c
+++ b/hardware/zeroplus-logic-cube/protocol.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
@@ -17,62 +17,58 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <math.h>
 #include "protocol.h"
 
 SR_PRIV unsigned int get_memory_size(int type)
 {
 	if (type == MEMORY_SIZE_8K)
 		return 8 * 1024;
-	else if (type == MEMORY_SIZE_64K)
-		return 64 * 1024;
-	else if (type == MEMORY_SIZE_128K)
-		return 128 * 1024;
-	else if (type == MEMORY_SIZE_512K)
-		return 512 * 1024;
+	else if (type <= MEMORY_SIZE_8M)
+		return (32 * 1024) << type;
 	else
 		return 0;
 }
 
-SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate)
+static int clz(unsigned int x)
 {
-	int i;
-
-	for (i = 0; zp_supported_samplerates[i]; i++)
-		if (samplerate == zp_supported_samplerates[i])
-			break;
-
-	if (!zp_supported_samplerates[i] || samplerate > devc->max_samplerate) {
-		sr_err("Unsupported samplerate.");
-		return SR_ERR_ARG;
+	int n = 0;
+	if (x == 0)
+		return 32;
+	if (!(x & 0xFFFF0000)) {
+		n = n + 16;
+		x = x << 16;
 	}
-
-	sr_info("Setting samplerate to %" PRIu64 "Hz.", samplerate);
-
-	if (samplerate >= SR_MHZ(1))
-		analyzer_set_freq(samplerate / SR_MHZ(1), FREQ_SCALE_MHZ);
-	else if (samplerate >= SR_KHZ(1))
-		analyzer_set_freq(samplerate / SR_KHZ(1), FREQ_SCALE_KHZ);
-	else
-		analyzer_set_freq(samplerate, FREQ_SCALE_HZ);
-
-	devc->cur_samplerate = samplerate;
-
-	return SR_OK;
+	if (!(x & 0xFF000000)) {
+		n = n + 8;
+		x = x << 8;
+	}
+	if (!(x & 0xF0000000)) {
+		n = n + 4;
+		x = x << 4;
+	}
+	if (!(x & 0xC0000000)) {
+		n = n + 2;
+		x = x << 2;
+	}
+	if (!(x & 0x80000000))
+		n = n + 1;
+	return n;
 }
 
 SR_PRIV int set_limit_samples(struct dev_context *devc, uint64_t samples)
 {
+	if (samples > devc->max_sample_depth)
+		samples = devc->max_sample_depth;
+
 	devc->limit_samples = samples;
 
 	if (samples <= 2 * 1024)
 		devc->memory_size = MEMORY_SIZE_8K;
 	else if (samples <= 16 * 1024)
 		devc->memory_size = MEMORY_SIZE_64K;
-	else if (samples <= 32 * 1024 ||
-		 devc->max_memory_size <= 32 * 1024)
-		devc->memory_size = MEMORY_SIZE_128K;
 	else
-		devc->memory_size = MEMORY_SIZE_512K;
+		devc->memory_size = 19 - clz(samples - 1);
 
 	sr_info("Setting memory size to %dK.",
 		get_memory_size(devc->memory_size) / 1024);
@@ -96,31 +92,48 @@ SR_PRIV int set_capture_ratio(struct dev_context *devc, uint64_t ratio)
 	return SR_OK;
 }
 
+SR_PRIV int set_voltage_threshold(struct dev_context *devc, double thresh)
+{
+	if (thresh > 6.0)
+		thresh = 6.0;
+	if (thresh < -6.0)
+		thresh = -6.0;
+
+	devc->cur_threshold = thresh;
+
+	analyzer_set_voltage_threshold((int) round(-9.1*thresh + 62.6));
+
+	sr_info("Setting voltage threshold to %fV.", devc->cur_threshold);
+
+	return SR_OK;
+}
+
 SR_PRIV void set_triggerbar(struct dev_context *devc)
 {
-	unsigned int ramsize;
-	unsigned int n;
-	unsigned int triggerbar;
-
-	ramsize = get_memory_size(devc->memory_size) / 4;
-	if (devc->trigger) {
-		n = ramsize;
-		if (devc->max_memory_size < n)
-			n = devc->max_memory_size;
-		if (devc->limit_samples < n)
-			n = devc->limit_samples;
-		n = n * devc->capture_ratio / 100;
-		if (n > ramsize - 8)
-			triggerbar = ramsize - 8;
-		else
-			triggerbar = n;
-	} else {
+	unsigned int trigger_depth, triggerbar, ramsize_trigger;
+
+	trigger_depth = get_memory_size(devc->memory_size) / 4;
+	if (devc->limit_samples < trigger_depth)
+		trigger_depth = devc->limit_samples;
+
+	if (devc->trigger)
+		triggerbar = trigger_depth * devc->capture_ratio / 100;
+	else
+		triggerbar = 0;
+
+	ramsize_trigger = trigger_depth - triggerbar;
+	/* Matches USB packet captures from official app/driver */
+	if (triggerbar > 2)
+		triggerbar -= 2;
+	else {
+		ramsize_trigger -= 1;
 		triggerbar = 0;
 	}
+
 	analyzer_set_triggerbar_address(triggerbar);
-	analyzer_set_ramsize_trigger_address(ramsize - triggerbar);
+	analyzer_set_ramsize_trigger_address(ramsize_trigger);
 
 	sr_dbg("triggerbar_address = %d(0x%x)", triggerbar, triggerbar);
 	sr_dbg("ramsize_triggerbar_address = %d(0x%x)",
-	       ramsize - triggerbar, ramsize - triggerbar);
+	       ramsize_trigger, ramsize_trigger);
 }