X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fprotocol.c;h=268be5dd9fea5f4d88f21c2b42e9a3a7ddb38803;hb=70424328c10640f0c1db0ab6334723658c043470;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..268be5dd 100644 --- a/hardware/zeroplus-logic-cube/protocol.c +++ b/hardware/zeroplus-logic-cube/protocol.c @@ -37,12 +37,12 @@ SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate) { int i; - for (i = 0; zp_supported_samplerates[i]; i++) - if (samplerate == zp_supported_samplerates[i]) + for (i = 0; zp_supported_samplerates_200[i]; i++) + if (samplerate == zp_supported_samplerates_200[i]) break; - if (!zp_supported_samplerates[i] || samplerate > devc->max_samplerate) { - sr_err("Unsupported samplerate."); + if (!zp_supported_samplerates_200[i] || samplerate > devc->max_samplerate) { + sr_err("Unsupported samplerate: %" PRIu64 "Hz.", samplerate); return SR_ERR_ARG; } @@ -68,8 +68,7 @@ SR_PRIV int set_limit_samples(struct dev_context *devc, uint64_t samples) 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) + else if (samples <= 32 * 1024 || devc->max_memory_size <= 32 * 1024) devc->memory_size = MEMORY_SIZE_128K; else devc->memory_size = MEMORY_SIZE_512K; @@ -98,9 +97,7 @@ 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; - unsigned int n; - unsigned int triggerbar; + unsigned int ramsize, n, triggerbar; ramsize = get_memory_size(devc->memory_size) / 4; if (devc->trigger) {