GPL headers: Use correct project name.

[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 30296da1c3e97acd43422a6342d6672a34c23265..bbccc6fd238cea5ee93c673973b8656902a929c0 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>
  *
@@ -33,33 +33,6 @@ SR_PRIV unsigned int get_memory_size(int type)
                return 0;
 }
 
-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])
-                       break;
-
-       if (!zp_supported_samplerates[i] || samplerate > devc->max_samplerate) {
-               sr_err("Unsupported samplerate.");
-               return SR_ERR_ARG;
-       }
-
-       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;
-}
-
 SR_PRIV int set_limit_samples(struct dev_context *devc, uint64_t samples)
 {
        devc->limit_samples = samples;
@@ -68,8 +41,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 +70,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) {