X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fzeroplus-logic-cube%2Fprotocol.c;h=205bf560e168f45f043f11385cadf0e149222203;hb=4c1433d172e974f8b47ade71ef5e9557ba77a9f5;hp=bbccc6fd238cea5ee93c673973b8656902a929c0;hpb=50985c2019b2b5a6ce394589d89ee925b4f5e3a9;p=libsigrok.git diff --git a/hardware/zeroplus-logic-cube/protocol.c b/hardware/zeroplus-logic-cube/protocol.c index bbccc6fd..205bf560 100644 --- a/hardware/zeroplus-logic-cube/protocol.c +++ b/hardware/zeroplus-logic-cube/protocol.c @@ -23,28 +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 clz(unsigned int x) +{ + int n = 0; + if (x == 0) + return 32; + if (!(x & 0xFFFF0000)) { + n = n + 16; + x = x << 16; + } + 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); @@ -70,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); }