zeroplus: Ignore capture ratio if there is no trigger

[libsigrok.git] / hardware / zeroplus-logic-cube / protocol.c

diff --git a/hardware/zeroplus-logic-cube/protocol.c b/hardware/zeroplus-logic-cube/protocol.c
index 268be5dd9fea5f4d88f21c2b42e9a3a7ddb38803..205bf560e168f45f043f11385cadf0e149222203 100644 (file)
--- 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>
  *
@@ -23,55 +23,51 @@ 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)
+SR_PRIV int clz(unsigned int x)
 {
-       int i;
-
-       for (i = 0; zp_supported_samplerates_200[i]; i++)
-               if (samplerate == zp_supported_samplerates_200[i])
-                       break;
-
-       if (!zp_supported_samplerates_200[i] || samplerate > devc->max_samplerate) {
-               sr_err("Unsupported samplerate: %" PRIu64 "Hz.", 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);
@@ -97,27 +93,30 @@ SR_PRIV int set_capture_ratio(struct dev_context *devc, uint64_t ratio)
 
 SR_PRIV void set_triggerbar(struct dev_context *devc)
 {
-       unsigned int ramsize, n, 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);
 }