output/csv: use intermediate time_t var, silence compiler warning

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

diff --git a/src/hardware/zeroplus-logic-cube/protocol.h b/src/hardware/zeroplus-logic-cube/protocol.h
index cd83f9b1c37660e77a4ddcda9dd8acb8cc70bbb9..b0c358be09923a61a86b2ef049d42b75a7a23eb8 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/protocol.h
+++ b/src/hardware/zeroplus-logic-cube/protocol.h
@@ -28,30 +28,25 @@
 #include "libsigrok-internal.h"
 #include "analyzer.h"
 
-#define LOG_PREFIX "zeroplus"
+#define LOG_PREFIX "zeroplus-logic-cube"
 
-/* Private, per-device-instance driver context. */
+struct zp_model;
 struct dev_context {
        uint64_t cur_samplerate;
        uint64_t max_samplerate;
        uint64_t limit_samples;
-       int num_channels;
-       int memory_size;
-       unsigned int max_sample_depth;
-       //uint8_t channel_mask;
-       //uint8_t trigger_mask[NUM_TRIGGER_STAGES];
-       //uint8_t trigger_value[NUM_TRIGGER_STAGES];
-       // uint8_t trigger_buffer[NUM_TRIGGER_STAGES];
+       size_t num_channels;
+       size_t memory_size;
+       size_t max_sample_depth;
        int trigger;
-       unsigned int capture_ratio;
+       uint64_t capture_ratio;
        double cur_threshold;
        const struct zp_model *prof;
 };
 
-SR_PRIV unsigned int get_memory_size(int type);
+SR_PRIV size_t get_memory_size(int type);
 SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate);
 SR_PRIV int set_limit_samples(struct dev_context *devc, uint64_t samples);
-SR_PRIV int set_capture_ratio(struct dev_context *devc, uint64_t ratio);
 SR_PRIV int set_voltage_threshold(struct dev_context *devc, double thresh);
 SR_PRIV void set_triggerbar(struct dev_context *devc);